raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-24 20:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Expunge all mentions of includeBlank and blankOption from angular services

Browse Source
This commit is contained in:
Rob Harrington
2016-09-18 11:06:59 +10:00
parent 338d3cbc38
commit cbbb047fc1
6 changed files with 11 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/admin/enterprises/services/enterprises.js.coffee
View File

@@ -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: {}

2
app/assets/javascripts/admin/line_items/controllers/line_items_controller.js.coffee
View File

@@ -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 = []

2
app/assets/javascripts/admin/line_items/filters/select_filter.js.coffee
View File

@@ -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

5
app/assets/javascripts/admin/order_cycles/services/order_cycles.js.coffee
View File

@@ -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
)

2
app/assets/javascripts/admin/utils/services/blank_option.js.coffee
View File

@@ -1,2 +0,0 @@
angular.module("admin.utils").value "blankOption", ->
{ id: "0", name: "All" }

25
spec/javascripts/unit/admin/order_cycles/services/order_cycles_spec.js.coffee
View File

@@ -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", ->