raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-24 20:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Extract unit_value_with_description into unit_description only when a string starting with a number is provided

Browse Source
This commit is contained in:
Rohan Mitchell
2014-02-19 13:32:17 +11:00
parent acbf1ed680
commit f88b930137
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -419,7 +419,7 @@ productEditModule.controller "AdminProductEditCtrl", [
$scope.packVariant = (product, variant) ->
if variant.hasOwnProperty("unit_value_with_description")
match = variant.unit_value_with_description.match(/^([\d\.]+|)( |)(.*)$/)
match = variant.unit_value_with_description.match(/^([\d\.]+(?= |$)|)( |)(.*)$/)
if match
product = $scope.findProduct(product.id)
variant.unit_value = parseFloat(match[1])

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

@@ -760,6 +760,14 @@ describe "AdminProductEditCtrl", ->
unit_description: 'Medium'
unit_value_with_description: "Medium"
it "extracts into unit_description when a string starting with a number is provided", ->
testVariant = {unit_value_with_description: "1kg"}
scope.packVariant(testProduct, testVariant)
expect(testVariant).toEqual
unit_value: null
unit_description: '1kg'
unit_value_with_description: "1kg"
it "sets blank values when no value provided", ->
testVariant = {unit_value_with_description: ""}
scope.packVariant(testProduct, testVariant)