From f88b930137a7c5609bd5f09a5fa13e5ecc050c8d Mon Sep 17 00:00:00 2001 From: Rohan Mitchell Date: Wed, 19 Feb 2014 13:32:17 +1100 Subject: [PATCH] Extract unit_value_with_description into unit_description only when a string starting with a number is provided --- .../javascripts/admin/bulk_product_update.js.coffee | 2 +- spec/javascripts/unit/bulk_product_update_spec.js.coffee | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/admin/bulk_product_update.js.coffee b/app/assets/javascripts/admin/bulk_product_update.js.coffee index 83590ba45d..42e727bb6f 100644 --- a/app/assets/javascripts/admin/bulk_product_update.js.coffee +++ b/app/assets/javascripts/admin/bulk_product_update.js.coffee @@ -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]) diff --git a/spec/javascripts/unit/bulk_product_update_spec.js.coffee b/spec/javascripts/unit/bulk_product_update_spec.js.coffee index d88bb1e34e..bd85419ac9 100644 --- a/spec/javascripts/unit/bulk_product_update_spec.js.coffee +++ b/spec/javascripts/unit/bulk_product_update_spec.js.coffee @@ -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)