summaryrefslogtreecommitdiff
path: root/app/helpers/milestones_helper.rb
diff options
context:
space:
mode:
authorDominik Sander <git@dsander.de>2015-04-30 23:29:00 +0200
committerDominik Sander <git@dsander.de>2015-05-01 01:12:58 +0200
commite6ee8d0ebebc217e247558507eac619931a47121 (patch)
tree5b313baddb457928d5fdc23136b86761c87fea34 /app/helpers/milestones_helper.rb
parent8d17e79d1dfc8fb415b3fe4dbabd11659fa6c42e (diff)
downloadgitlab-ce-e6ee8d0ebebc217e247558507eac619931a47121.tar.gz
Group milestones by title in the dashboard and all other issue views
This groups milestones by title for issue views like it has been done for the milestone dashboard/project overview. Before milestones with the same title would show up multiple times in the filter dropdown and one could only filter per project and milestone. Now the milestone filter is based on the title of the milestone, i.e. all issues marked with the same milestone title are shown.
Diffstat (limited to 'app/helpers/milestones_helper.rb')
-rw-r--r--app/helpers/milestones_helper.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/helpers/milestones_helper.rb b/app/helpers/milestones_helper.rb
index 282bdf744d2..93e33ebefd8 100644
--- a/app/helpers/milestones_helper.rb
+++ b/app/helpers/milestones_helper.rb
@@ -28,6 +28,7 @@ module MilestonesHelper
Milestone.where(project_id: @projects)
end.active
- options_from_collection_for_select(milestones, 'id', 'title', params[:milestone_id])
+ grouped_milestones = Milestones::GroupService.new(milestones).execute
+ options_from_collection_for_select(grouped_milestones, 'title', 'title', params[:milestone_title])
end
end