diff options
| author | Marin Jankovski <marin@gitlab.com> | 2014-06-27 10:14:57 +0200 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2014-06-30 09:45:16 +0200 |
| commit | c223fb1a9677ae00285426090618f5762de9f40e (patch) | |
| tree | b09d63edbd4982066daf2f25203e12b8e0655b3a /app/controllers/groups/milestones_controller.rb | |
| parent | b6425f33bc0b0547058e96e5ab99a7892d9297f2 (diff) | |
| download | gitlab-ce-c223fb1a9677ae00285426090618f5762de9f40e.tar.gz | |
Start building group milestone show page.
Diffstat (limited to 'app/controllers/groups/milestones_controller.rb')
| -rw-r--r-- | app/controllers/groups/milestones_controller.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/controllers/groups/milestones_controller.rb b/app/controllers/groups/milestones_controller.rb index a86cc58c021..235b27f53a9 100644 --- a/app/controllers/groups/milestones_controller.rb +++ b/app/controllers/groups/milestones_controller.rb @@ -13,14 +13,16 @@ class Groups::MilestonesController < ApplicationController def show project_milestones = Milestone.where(project_id: group.projects) - @group_milestones = Milestones::GroupService.new(project_milestones).milestone(title) + @group_milestone = Milestones::GroupService.new(project_milestones).milestone(title) + @project_issues = @group_milestone.filter_by(params[:status], "issues") + @project_merge_requests = @group_milestone.filter_by(params[:status], "merge_requests") end def update project_milestones = Milestone.where(project_id: group.projects) @group_milestones = Milestones::GroupService.new(project_milestones).milestone(title) - @group_milestones.each do |milestone| + @group_milestones.milestones.each do |milestone| Milestones::UpdateService.new(milestone.project, current_user, params[:milestone]).execute(milestone) end |