From fe58121c7f34d84234dc6364e779c9dc1e7c84be Mon Sep 17 00:00:00 2001 From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com> Date: Sat, 28 Mar 2020 23:18:30 +0100 Subject: [PATCH] Fix clear filters button --- .../controllers/line_items_controller.js.coffee | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/admin/line_items/controllers/line_items_controller.js.coffee b/app/assets/javascripts/admin/line_items/controllers/line_items_controller.js.coffee index 164fbdc33d..09dfe592c9 100644 --- a/app/assets/javascripts/admin/line_items/controllers/line_items_controller.js.coffee +++ b/app/assets/javascripts/admin/line_items/controllers/line_items_controller.js.coffee @@ -12,6 +12,10 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout, $scope.sharedResource = false $scope.columns = Columns.columns $scope.sorting = SortOptions + $scope.distributorFilter = '' + $scope.supplierFilter = '' + $scope.orderCycleFilter = '' + $scope.quickSearch = '' $scope.page = 1 $scope.per_page = 50 @@ -22,7 +26,9 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout, $scope.distributorFilter = '' $scope.supplierFilter = '' $scope.orderCycleFilter = '' - $scope.quickSearch = "" + $scope.quickSearch = '' + $scope.page = 1 + $scope.refreshData() $scope.changePage = (newPage) -> $scope.page = newPage @@ -76,8 +82,6 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout, StatusMessage.clear() unless $scope.initialized $scope.initialized = true - $timeout -> - $scope.resetSelectFilters() $scope.$watch 'bulk_order_form.$dirty', (newVal, oldVal) -> if newVal == true