diff options
author | Oliver Rogers <oliver.rogers@bluefinsolutions.com> | 2016-01-23 22:31:46 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-02-10 17:42:20 +0100 |
commit | a7567ca15203f63b59a736d5d391054ebc20d73d (patch) | |
tree | 47bddf2c46cca7b9d3a2a3c403321f89d22c28aa /app/controllers/projects | |
parent | fd1a68d4da4cba2f8e2894e2e1adfbe26216f491 (diff) | |
download | gitlab-ce-a7567ca15203f63b59a736d5d391054ebc20d73d.tar.gz |
Fix milestone order in project and issue edit lists to due_dateolirogers/gitlab-ce-project-milestone-order
Diffstat (limited to 'app/controllers/projects')
-rw-r--r-- | app/controllers/projects/milestones_controller.rb | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/app/controllers/projects/milestones_controller.rb b/app/controllers/projects/milestones_controller.rb index 15506bd677a..a5c4ef1c7c7 100644 --- a/app/controllers/projects/milestones_controller.rb +++ b/app/controllers/projects/milestones_controller.rb @@ -11,11 +11,12 @@ class Projects::MilestonesController < Projects::ApplicationController respond_to :html def index - @milestones = case params[:state] - when 'all'; @project.milestones.order("state, due_date DESC") - when 'closed'; @project.milestones.closed.order("due_date DESC") - else @project.milestones.active.order("due_date ASC") - end + @milestones = + case params[:state] + when 'all' then @project.milestones.reorder(due_date: :desc, title: :asc) + when 'closed' then @project.milestones.closed.reorder(due_date: :desc, title: :asc) + else @project.milestones.active.reorder(due_date: :asc, title: :asc) + end @milestones = @milestones.includes(:project) @milestones = @milestones.page(params[:page]).per(PER_PAGE) |