raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-29 21:17:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7404 from jibees/7180-variant-unit-scale-field-invalid-when-editing-a-product

Browse Source 
Fix Variant Unit Scale field initialization in Edit Product form
This commit is contained in:
Pau Pérez Fabregat
2021-04-15 18:20:31 +02:00
committed by GitHub
parent 0c182c4606 86cba6e904
commit 5ddccc79ae
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/admin/products/controllers/edit_units_controller.js.coffee
View File

@@ -9,7 +9,7 @@ angular.module("admin.products").controller "editUnitsCtrl", ($scope, VariantUni
if $scope.product.variant_unit == 'items'
$scope.variant_unit_with_scale = 'items'
else
$scope.variant_unit_with_scale = $scope.product.variant_unit + '_' + $scope.product.variant_unit_scale
$scope.variant_unit_with_scale = $scope.product.variant_unit + '_' + $scope.product.variant_unit_scale.replace(/\.0$/, '');
$scope.setFields = ->
if $scope.variant_unit_with_scale == 'items'

2
spec/features/admin/products_spec.rb
View File

@@ -488,7 +488,7 @@ feature '
expect(flash_message).to eq('Product "a product" has been successfully updated!')
product.reload
expect(product.variant_unit).to eq(var_unit)
# TODO -> expect(page).to have_select('product_variant_unit_with_scale', :selected => dropdown_option)
expect(page).to have_select('product_variant_unit_with_scale', selected: dropdown_option)
expect(product.variant_unit_scale).to eq(var_unit_scale)
end
end