diff --git a/app/assets/javascripts/admin/bulk_product_update.js.coffee b/app/assets/javascripts/admin/bulk_product_update.js.coffee index d464a49bf4..3e5f388a5f 100644 --- a/app/assets/javascripts/admin/bulk_product_update.js.coffee +++ b/app/assets/javascripts/admin/bulk_product_update.js.coffee @@ -32,7 +32,6 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout $scope.filteredProducts = [] $scope.currentFilters = [] $scope.limit = 15 - $scope.productsWithUnsavedVariants = [] $scope.query = "" $scope.DisplayProperties = DisplayProperties @@ -114,7 +113,6 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout display_name: null on_hand: null price: null - $scope.productsWithUnsavedVariants.push product DisplayProperties.setShowVariants product.id, true @@ -196,7 +194,7 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout filters: $scope.currentFilters ).success((data) -> DirtyProducts.clear() - BulkProducts.updateVariantLists(data.products, $scope.productsWithUnsavedVariants) + BulkProducts.updateVariantLists(data.products || []) $timeout -> $scope.displaySuccess() ).error (data, status) -> if status == 400 && data.errors? && data.errors.length > 0 diff --git a/app/assets/javascripts/admin/services/bulk_products.js.coffee b/app/assets/javascripts/admin/services/bulk_products.js.coffee index 0d2de5ce77..022345e9d8 100644 --- a/app/assets/javascripts/admin/services/bulk_products.js.coffee +++ b/app/assets/javascripts/admin/services/bulk_products.js.coffee @@ -16,9 +16,9 @@ angular.module("ofn.admin").factory "BulkProducts", (PagedFetcher, dataFetcher, @unpackProduct newProduct @insertProductAfter(product, newProduct) - updateVariantLists: (serverProducts, productsWithUnsavedVariants) -> - for product in productsWithUnsavedVariants - server_product = @findProductInList(product.id, serverProducts) + updateVariantLists: (serverProducts) -> + for server_product in serverProducts + product = @findProductInList(server_product.id, @products) product.variants = server_product.variants @loadVariantUnitValues product