raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-12 03:50:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enterprises etched by for_order_cycle action now use permissions scoped using an order cycle or coordinator

Browse Source
This commit is contained in:
Rob Harrington
2015-03-20 16:33:08 +11:00
parent a1aa9512a8
commit 45f6042d3d
6 changed files with 77 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/admin/order_cycle.js.erb.coffee
View File

@@ -1,6 +1,6 @@
angular.module('admin.order_cycles', ['ngResource'])
.controller('AdminCreateOrderCycleCtrl', ['$scope', 'OrderCycle', 'Enterprise', 'EnterpriseFee', 'ocInstance', ($scope, OrderCycle, Enterprise, EnterpriseFee, ocInstance) ->
$scope.enterprises = Enterprise.index()
$scope.enterprises = Enterprise.index(coordinator_id: ocInstance.coordinator_id)
$scope.supplied_products = Enterprise.supplied_products
$scope.enterprise_fees = EnterpriseFee.index()
@@ -81,11 +81,11 @@ angular.module('admin.order_cycles', ['ngResource'])
])
.controller('AdminEditOrderCycleCtrl', ['$scope', '$location', 'OrderCycle', 'Enterprise', 'EnterpriseFee', ($scope, $location, OrderCycle, Enterprise, EnterpriseFee) ->
$scope.enterprises = Enterprise.index()
order_cycle_id = $location.absUrl().match(/\/admin\/order_cycles\/(\d+)/)[1]
$scope.enterprises = Enterprise.index(order_cycle_id: order_cycle_id)
$scope.supplied_products = Enterprise.supplied_products
$scope.enterprise_fees = EnterpriseFee.index()
order_cycle_id = $location.absUrl().match(/\/admin\/order_cycles\/(\d+)/)[1]
$scope.order_cycle = OrderCycle.load(order_cycle_id)
$scope.loaded = ->

2
app/assets/javascripts/admin/order_cycles/controllers/simple_create.js.coffee
View File

@@ -1,5 +1,5 @@
angular.module('admin.order_cycles').controller "AdminSimpleCreateOrderCycleCtrl", ($scope, OrderCycle, Enterprise, EnterpriseFee) ->
$scope.enterprises = Enterprise.index (enterprises) =>
$scope.enterprises = Enterprise.index {}, (enterprises) =>
$scope.init(enterprises)
$scope.enterprise_fees = EnterpriseFee.index()
$scope.order_cycle = OrderCycle.order_cycle

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

@@ -1,24 +1,28 @@
angular.module('admin.order_cycles').factory('Enterprise', ($resource) ->
Enterprise = $resource('/admin/enterprises/for_order_cycle/:enterprise_id.json', {}, {'index': {method: 'GET', isArray: true}})
Enterprise = $resource('/admin/enterprises/for_order_cycle/:enterprise_id.json', {}, {
'index':
method: 'GET'
isArray: true
params:
order_cycle_id: '@order_cycle_id'
coordinator_id: '@coordinator_id'
})
{
Enterprise: Enterprise
enterprises: {}
supplied_products: []
loaded: false
index: (callback=null) ->
service = this
Enterprise.index (data) ->
index: (params={}, callback=null) ->
Enterprise.index params, (data) =>
for enterprise in data
service.enterprises[enterprise.id] = enterprise
@enterprises[enterprise.id] = enterprise
for product in enterprise.supplied_products
service.supplied_products.push(product)
@supplied_products.push(product)
service.loaded = true
(callback || angular.noop)(service.enterprises)
@loaded = true
(callback || angular.noop)(@enterprises)
this.enterprises
@@ -40,4 +44,4 @@ angular.module('admin.order_cycles').factory('Enterprise', ($resource) ->
numVariants += if product.variants.length == 0 then 1 else product.variants.length
numVariants
})
})