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

Only perform scaling when a scale is present. Fixes items values not saving then loading as infinity.

Browse Source
This commit is contained in:
Rohan Mitchell
2014-02-06 13:43:28 +11:00
parent a1f75aa55e
commit 33691085bd
2 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/assets/javascripts/admin/bulk_product_update.js.coffee
View File

@@ -221,7 +221,10 @@ productEditModule.controller "AdminProductEditCtrl", [
$scope.variantUnitValue = (product, variant) ->
if variant.unit_value
variant.unit_value / product.variant_unit_scale
if product.variant_unit_scale
variant.unit_value / product.variant_unit_scale
else
variant.unit_value
else
null
@@ -376,7 +379,7 @@ productEditModule.controller "AdminProductEditCtrl", [
if match
product = $scope.findProduct(product.id)
variant.unit_value = parseFloat(match[1]) || null
variant.unit_value *= product.variant_unit_scale if variant.unit_value
variant.unit_value *= product.variant_unit_scale if variant.unit_value && product.variant_unit_scale
variant.unit_description = match[3]