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

Refactor order_cycle_enterpises_for permission method, now requires an order cycle

Browse Source
This commit is contained in:
Rob Harrington
2015-04-08 13:00:17 +10:00
parent 4dcfec1de9
commit 104a8ddecf
9 changed files with 54 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/admin/enterprise_fees_controller.rb
View File

@@ -76,10 +76,10 @@ module Admin
def collection
case action
when :for_order_cycle
options = {}
options[:coordinator] = Enterprise.find(params[:coordinator_id]) if params[:coordinator_id]
options[:order_cycle] = OrderCycle.find(params[:order_cycle_id]) if params[:order_cycle_id]
enterprises = OpenFoodNetwork::Permissions.new(spree_current_user).order_cycle_enterprises_for(options)
order_cycle = OrderCycle.find_by_id(params[:order_cycle_id]) if params[:order_cycle_id]
coordinator = Enterprise.find_by_id(params[:coordinator_id]) if params[:coordinator_id]
order_cycle = OrderCycle.new(coordinator: coordinator) if order_cycle.nil? && coordinator.present?
enterprises = OpenFoodNetwork::Permissions.new(spree_current_user).order_cycle_enterprises_for(order_cycle)
return EnterpriseFee.for_enterprises(enterprises).order('enterprise_id', 'fee_type', 'name')
else
collection = EnterpriseFee.managed_by(spree_current_user).order('enterprise_id', 'fee_type', 'name')

8
app/controllers/admin/enterprises_controller.rb
View File

@@ -95,10 +95,10 @@ module Admin
def collection
case action
when :for_order_cycle
options = {}
options[:coordinator] = Enterprise.find(params[:coordinator_id]) if params[:coordinator_id]
options[:order_cycle] = OrderCycle.find(params[:order_cycle_id]) if params[:order_cycle_id]
return OpenFoodNetwork::Permissions.new(spree_current_user).order_cycle_enterprises_for(options)
order_cycle = OrderCycle.find_by_id(params[:order_cycle_id]) if params[:order_cycle_id]
coordinator = Enterprise.find_by_id(params[:coordinator_id]) if params[:coordinator_id]
order_cycle = OrderCycle.new(coordinator: coordinator) if order_cycle.nil? && coordinator.present?
return OpenFoodNetwork::Permissions.new(spree_current_user).order_cycle_enterprises_for(order_cycle)
else
# TODO was ordered with is_distributor DESC as well, not sure why or how we want to sort this now
OpenFoodNetwork::Permissions.new(spree_current_user).