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

Merge branch 'master' into bom

Browse Source
This commit is contained in:
Rob H
2014-03-21 13:47:50 +11:00
parent f2729f9e80 250e1d236b
commit cbd3722380
129 changed files with 1603 additions and 1629 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -379,7 +379,11 @@ productEditModule.controller "AdminProductEditCtrl", [
else
product.variant_unit = product.variant_unit_with_scale
product.variant_unit_scale = null
else
product.variant_unit = product.variant_unit_scale = null
$scope.packVariant product, product.master if product.master
if product.variants
for id, variant of product.variants
$scope.packVariant product, variant