diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2017-11-22 14:40:52 +0300 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-11-22 14:40:52 +0300 |
commit | e548c613346a09ba2fc8dfd6ed64da6628ec6a45 (patch) | |
tree | e1ccf4abc315ba7175cc89657035cd9d01904cb9 /app | |
parent | 13cfcfc23bf9ee6d599c34623a965671373fd75d (diff) | |
parent | a4d71cba7ef80e6f3c10f148dd1edfbef7f82893 (diff) |
Merge branch '39720-group-milestone-sorting' into 'master'
Add Group Milestone sorting
Closes #39720
See merge request gitlab-org/gitlab-ce!15230
Diffstat (limited to 'app')
-rw-r--r-- | app/controllers/groups/milestones_controller.rb | 3 | ||||
-rw-r--r-- | app/views/groups/milestones/index.html.haml | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/controllers/groups/milestones_controller.rb b/app/controllers/groups/milestones_controller.rb index 7a7bcb1a3d2..f013d21275e 100644 --- a/app/controllers/groups/milestones_controller.rb +++ b/app/controllers/groups/milestones_controller.rb @@ -80,7 +80,8 @@ class Groups::MilestonesController < Groups::ApplicationController milestones = MilestonesFinder.new(search_params).execute legacy_milestones = GroupMilestone.build_collection(group, group_projects, params) - milestones + legacy_milestones + @sort = params[:sort] || 'due_date_asc' + MilestoneArray.sort(milestones + legacy_milestones, @sort) end def milestone diff --git a/app/views/groups/milestones/index.html.haml b/app/views/groups/milestones/index.html.haml index cb4fc69d5b8..f5f621507b8 100644 --- a/app/views/groups/milestones/index.html.haml +++ b/app/views/groups/milestones/index.html.haml @@ -4,6 +4,7 @@ = render 'shared/milestones_filter', counts: @milestone_states .nav-controls + = render 'shared/milestones_sort_dropdown' - if can?(current_user, :admin_milestones, @group) = link_to "New milestone", new_group_milestone_path(@group), class: "btn btn-new" |