diff --git a/app/assets/javascripts/admin/enterprises/services/enterprises.js.coffee b/app/assets/javascripts/admin/enterprises/services/enterprises.js.coffee index 44dfb503a5..57c6dc4b1a 100644 --- a/app/assets/javascripts/admin/enterprises/services/enterprises.js.coffee +++ b/app/assets/javascripts/admin/enterprises/services/enterprises.js.coffee @@ -1,4 +1,4 @@ -angular.module("admin.enterprises").factory 'Enterprises', ($q, EnterpriseResource, blankOption) -> +angular.module("admin.enterprises").factory 'Enterprises', ($q, EnterpriseResource) -> new class Enterprises enterprisesByID: {} pristineByID: {} 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 f5d11fda58..1f0d6031b4 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 @@ -1,4 +1,4 @@ -angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout, $http, $q, StatusMessage, Columns, Dereferencer, Orders, LineItems, Enterprises, OrderCycles, blankOption, VariantUnitManager, RequestMonitor) -> +angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout, $http, $q, StatusMessage, Columns, Dereferencer, Orders, LineItems, Enterprises, OrderCycles, VariantUnitManager, RequestMonitor) -> $scope.initialized = false $scope.RequestMonitor = RequestMonitor $scope.filteredLineItems = [] diff --git a/app/assets/javascripts/admin/line_items/filters/select_filter.js.coffee b/app/assets/javascripts/admin/line_items/filters/select_filter.js.coffee index 6b6428c010..fb91acdeb3 100644 --- a/app/assets/javascripts/admin/line_items/filters/select_filter.js.coffee +++ b/app/assets/javascripts/admin/line_items/filters/select_filter.js.coffee @@ -1,4 +1,4 @@ -angular.module("admin.lineItems").filter "selectFilter", (blankOption, RequestMonitor) -> +angular.module("admin.lineItems").filter "selectFilter", (RequestMonitor) -> return (lineItems,selectedSupplier,selectedDistributor,selectedOrderCycle) -> filtered = [] unless RequestMonitor.loading diff --git a/app/assets/javascripts/admin/order_cycles/services/order_cycles.js.coffee b/app/assets/javascripts/admin/order_cycles/services/order_cycles.js.coffee index a182f19f12..71076c42c3 100644 --- a/app/assets/javascripts/admin/order_cycles/services/order_cycles.js.coffee +++ b/app/assets/javascripts/admin/order_cycles/services/order_cycles.js.coffee @@ -1,11 +1,9 @@ -angular.module("admin.orderCycles").factory 'OrderCycles', ($q, OrderCycleResource, blankOption) -> +angular.module("admin.orderCycles").factory 'OrderCycles', ($q, OrderCycleResource) -> new class OrderCycles orderCyclesByID: {} pristineByID: {} index: (params={}, callback=null) -> - includeBlank = !!params['includeBlank'] - delete params['includeBlank'] OrderCycleResource.index(params, (data) => for orderCycle in data @orderCyclesByID[orderCycle.id] = orderCycle @@ -13,7 +11,6 @@ angular.module("admin.orderCycles").factory 'OrderCycles', ($q, OrderCycleResour (callback || angular.noop)(data) - data.unshift(blankOption()) if includeBlank data ) diff --git a/app/assets/javascripts/admin/utils/services/blank_option.js.coffee b/app/assets/javascripts/admin/utils/services/blank_option.js.coffee deleted file mode 100644 index f4089aa20d..0000000000 --- a/app/assets/javascripts/admin/utils/services/blank_option.js.coffee +++ /dev/null @@ -1,2 +0,0 @@ -angular.module("admin.utils").value "blankOption", -> - { id: "0", name: "All" } diff --git a/spec/javascripts/unit/admin/order_cycles/services/order_cycles_spec.js.coffee b/spec/javascripts/unit/admin/order_cycles/services/order_cycles_spec.js.coffee index aebdb19f6f..e4d51d508c 100644 --- a/spec/javascripts/unit/admin/order_cycles/services/order_cycles_spec.js.coffee +++ b/spec/javascripts/unit/admin/order_cycles/services/order_cycles_spec.js.coffee @@ -37,25 +37,14 @@ describe "OrderCycles service", -> expect(result).toDeepEqual response describe "when no params are passed", -> - describe "where includeBlank param is truthy", -> - beforeEach -> - params = {includeBlank: true, someParam: 'someVal'} - $httpBackend.expectGET('/admin/order_cycles.json?someParam=someVal').respond 200, response - result = OrderCycles.index(params) - $httpBackend.flush() + beforeEach -> + params = { someParam: 'someVal'} + $httpBackend.expectGET('/admin/order_cycles.json?someParam=someVal').respond 200, response + result = OrderCycles.index(params) + $httpBackend.flush() - it "returns an array of orderCycles", -> - expect(result).toDeepEqual [{id: '0', name: 'All'} ,{ id: 5, name: 'OrderCycle 1'}] - - describe "where includeBlank param is falsey", -> - beforeEach -> - params = {includeBlank: false, someParam: 'someVal'} - $httpBackend.expectGET('/admin/order_cycles.json?someParam=someVal').respond 200, response - result = OrderCycles.index(params) - $httpBackend.flush() - - it "returns an array of orderCycles", -> - expect(result).toDeepEqual response + it "returns an array of orderCycles", -> + expect(result).toDeepEqual response describe "#save", ->