consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2947 from jsperezg/fix_action_sorting

Browse Source 
Fixes action sorting
This commit is contained in:
Alberto
2018-10-05 17:25:13 +02:00
committed by GitHub
parent 1163999ec0 491e6e4b6e
commit 3771e6105e
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/controllers/admin/dashboard/actions_controller.rb
View File

@@ -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