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

Do not set unit value or description on variant when unpacked field is undefined

Browse Source
This commit is contained in:
Rohan Mitchell
2013-12-12 10:50:03 +11:00
parent 42d3947861
commit a67c7b808d
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -295,10 +295,11 @@ productsApp.controller "AdminBulkProductsCtrl", [
$scope.packVariant = (variant) ->
match = variant.unit_value_with_description.match(/^([\d\.]+|)( |)(.*)$/)
if match
variant.unit_value = parseFloat(match[1]) || null
variant.unit_description = match[3]
if variant.hasOwnProperty("unit_value_with_description")
match = variant.unit_value_with_description.match(/^([\d\.]+|)( |)(.*)$/)
if match
variant.unit_value = parseFloat(match[1]) || null
variant.unit_description = match[3]
$scope.productsWithoutDerivedAttributes = ->

5
spec/javascripts/unit/bulk_product_update_spec.js.coffee
View File

@@ -552,6 +552,11 @@ describe "AdminBulkProductsCtrl", ->
unit_description: ''
unit_value_with_description: ""
it "sets nothing when the field is undefined", ->
testVariant = {}
scope.packVariant(testVariant)
expect(testVariant).toEqual {}
describe "filtering products", ->
beforeEach ->