diff --git a/app/assets/javascripts/admin/bulk_product_update.js.coffee b/app/assets/javascripts/admin/bulk_product_update.js.coffee index 500b4547d4..a9f2f20d14 100644 --- a/app/assets/javascripts/admin/bulk_product_update.js.coffee +++ b/app/assets/javascripts/admin/bulk_product_update.js.coffee @@ -28,7 +28,7 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout $scope.filterTaxons = [{id: "0", name: ""}].concat $scope.taxons $scope.producerFilter = "0" $scope.categoryFilter = "0" - $scope.importDateFilter = "" + $scope.importDateFilter = "0" $scope.products = BulkProducts.products $scope.filteredProducts = [] $scope.currentFilters = [] diff --git a/app/assets/javascripts/admin/filters/import_date_filter.js.coffee b/app/assets/javascripts/admin/filters/import_date_filter.js.coffee new file mode 100644 index 0000000000..768d305afd --- /dev/null +++ b/app/assets/javascripts/admin/filters/import_date_filter.js.coffee @@ -0,0 +1,4 @@ +angular.module("ofn.admin").filter "importDate", ($filter) -> + return (products, importDate) -> + return products if importDate == "0" + $filter('filter')( products, { import_date: importDate } ) diff --git a/app/views/spree/admin/products/bulk_edit/_products.html.haml b/app/views/spree/admin/products/bulk_edit/_products.html.haml index 4072fd0220..f4193ca883 100644 --- a/app/views/spree/admin/products/bulk_edit/_products.html.haml +++ b/app/views/spree/admin/products/bulk_edit/_products.html.haml @@ -8,7 +8,7 @@ = render 'spree/admin/products/bulk_edit/products_head' - %tbody{ 'ng-repeat' => 'product in filteredProducts = ( products | filter:query | producer: producerFilter | category: categoryFilter | filter: (importDateFilter != 0) && {import_date: importDateFilter} | limitTo:limit )', 'ng-class-even' => "'even'", 'ng-class-odd' => "'odd'" } + %tbody{ 'ng-repeat' => 'product in filteredProducts = ( products | filter:query | producer: producerFilter | category: categoryFilter | importDate: importDateFilter | limitTo:limit )', 'ng-class-even' => "'even'", 'ng-class-odd' => "'odd'" } = render 'spree/admin/products/bulk_edit/products_product' = render 'spree/admin/products/bulk_edit/products_variant'