Merge pull request #2821 from nikobozi/oc-clear-filter

Make 'Clear All' button work on order cycle page

app/assets/javascripts/admin/order_cycles/controllers/order_cycles_controller.js.coffee

@@ -3,8 +3,12 @@ angular.module("admin.orderCycles").controller "OrderCyclesCtrl", ($scope, $q, C
   $scope.columns = Columns.columns
   $scope.saveAll = -> OrderCycles.saveChanges($scope.order_cycles_form)
   $scope.ordersCloseAtLimit = -31 # days
-  $scope.involvingFilter = 0
-  $scope.scheduleFilter = 0
+
+  $scope.resetSelectFilters = ->
+    $scope.scheduleFilter = 0
+    $scope.involvingFilter = 0
+    $scope.query = ''
+  $scope.resetSelectFilters()
 
   compileData = ->
     for schedule in $scope.schedules

spec/javascripts/unit/admin/order_cycles/controllers/order_cycles_controller_spec.js.coffee

@@ -72,3 +72,13 @@ describe "OrderCyclesCtrl", ->
 
       it "the RequestMonitor will not longer have a state of loading", ->
         expect(scope.RequestMonitor.loading).toBe false
+
+  describe "filtering order cycles", ->
+    it "filters by and resets filter variables", ->
+      scope.query = "test"
+      scope.scheduleFilter = 1
+      scope.involvingFilter = 1
+      scope.resetSelectFilters()
+      expect(scope.query).toBe ""
+      expect(scope.scheduleFilter).toBe 0
+      expect(scope.involvingFilter).toBe 0