diff options
| author | George Andrinopoulos <geoandri@gmail.com> | 2017-03-24 00:39:12 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-03-24 00:39:12 +0000 |
| commit | e118d48df91ba04a9cba3ddb90ef20166ff8d9b8 (patch) | |
| tree | 4be00723bd36af94261ab38c378809b1f6d8c01a /app/controllers/projects/milestones_controller.rb | |
| parent | 902ea5c85b97fe12a49b2634244368a71b0239ed (diff) | |
| download | gitlab-ce-e118d48df91ba04a9cba3ddb90ef20166ff8d9b8.tar.gz | |
Add dropdown sort to project milestones
Diffstat (limited to 'app/controllers/projects/milestones_controller.rb')
| -rw-r--r-- | app/controllers/projects/milestones_controller.rb | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/app/controllers/projects/milestones_controller.rb b/app/controllers/projects/milestones_controller.rb index be52b0fa7cf..5922e686cd0 100644 --- a/app/controllers/projects/milestones_controller.rb +++ b/app/controllers/projects/milestones_controller.rb @@ -13,11 +13,14 @@ class Projects::MilestonesController < Projects::ApplicationController def index @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) + when 'all' then @project.milestones + when 'closed' then @project.milestones.closed + else @project.milestones.active end + @sort = params[:sort] || 'due_date_asc' + @milestones = @milestones.sort(@sort) + @milestones = @milestones.includes(:project) respond_to do |format| format.html do |