diff --git a/app/helpers/order_cycles_helper.rb b/app/helpers/order_cycles_helper.rb index 6e401af0a6..b870f9c985 100644 --- a/app/helpers/order_cycles_helper.rb +++ b/app/helpers/order_cycles_helper.rb @@ -3,6 +3,10 @@ module OrderCyclesHelper @current_order_cycle ||= current_order(false).andand.order_cycle end + def order_cycle_permitted_in(enterprises) + enterprises.merge(order_cycle_permitted_enterprises) + end + def order_cycle_permitted_enterprises OpenFoodNetwork::Permissions.new(spree_current_user).order_cycle_enterprises end diff --git a/app/views/admin/order_cycles/_row.html.haml b/app/views/admin/order_cycles/_row.html.haml index 9d05ac176d..91191a2a8a 100644 --- a/app/views/admin/order_cycles/_row.html.haml +++ b/app/views/admin/order_cycles/_row.html.haml @@ -7,12 +7,12 @@ - unless order_cycles_simple_index %td.suppliers - - order_cycle.suppliers.merge(order_cycle_permitted_enterprises).each do |s| + - order_cycle_permitted_in(order_cycle.suppliers).each do |s| = s.name %br/ %td= order_cycle.coordinator.name %td.distributors - - order_cycle.distributors.merge(order_cycle_permitted_enterprises).each do |d| + - order_cycle_permitted_in(order_cycle.distributors).each do |d| = d.name %br/