diff --git a/app/controllers/admin/order_cycles_controller.rb b/app/controllers/admin/order_cycles_controller.rb index b629a2fd3b..435be5b38e 100644 --- a/app/controllers/admin/order_cycles_controller.rb +++ b/app/controllers/admin/order_cycles_controller.rb @@ -5,7 +5,7 @@ module Admin class OrderCyclesController < ResourceController include OrderCyclesHelper - before_filter :load_order_cycle_set, :only => :index + before_filter :load_data_for_index, :only => :index before_filter :require_coordinator, only: :new def show @@ -73,19 +73,20 @@ module Admin protected - def collection + def collection(show_more=false) ocs = OrderCycle.managed_by(spree_current_user) ocs.undated + ocs.soonest_closing + ocs.soonest_opening + - ocs.recently_closed + (show_more ? ocs.closed : ocs.recently_closed) end private - def load_order_cycle_set + def load_data_for_index + @show_more = !!params[:show_more] @order_cycle_enterprises = OpenFoodNetwork::Permissions.new(spree_current_user).order_cycle_enterprises - @order_cycle_set = OrderCycleSet.new :collection => collection + @order_cycle_set = OrderCycleSet.new :collection => collection(@show_more) end def require_coordinator diff --git a/app/views/admin/order_cycles/index.html.haml b/app/views/admin/order_cycles/index.html.haml index afe18bc230..2afed8ed4c 100644 --- a/app/views/admin/order_cycles/index.html.haml +++ b/app/views/admin/order_cycles/index.html.haml @@ -4,6 +4,12 @@ = content_for :page_actions do %li#new_order_cycle_link = button_link_to "New Order Cycle", main_app.new_admin_order_cycle_path, :icon => 'icon-plus', :id => 'admin_new_order_cycle_link' + - if @show_more + %li + = button_link_to "Show less", main_app.admin_order_cycles_path + - else + %li + = button_link_to "Show more", main_app.admin_order_cycles_path(params: { show_more: true }) = form_for @order_cycle_set, :url => main_app.bulk_update_admin_order_cycles_path do |f| %table.index#listing_order_cycles