diff --git a/app/controllers/admin/dashboard/actions_controller.rb b/app/controllers/admin/dashboard/actions_controller.rb index 358174c0e..07eae766c 100644 --- a/app/controllers/admin/dashboard/actions_controller.rb +++ b/app/controllers/admin/dashboard/actions_controller.rb @@ -2,7 +2,7 @@ class Admin::Dashboard::ActionsController < Admin::Dashboard::BaseController helper_method :dashboard_action, :resource def index - @dashboard_actions = ::Dashboard::Action.order(required_supports: :asc) + @dashboard_actions = proposed_actions + resources end def new @@ -64,4 +64,12 @@ class Admin::Dashboard::ActionsController < Admin::Dashboard::BaseController def dashboard_action @dashboard_action ||= ::Dashboard::Action.find(params[:id]) end + + def proposed_actions + ::Dashboard::Action.proposed_actions.order(order: :asc) + end + + def resources + ::Dashboard::Action.resources.order(required_supports: :asc, day_offset: :asc) + end end