Commit 00455a47 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'group_milestones_improvements' into 'master'

Group milestones improvements

Fixes #1400

Fixes #1401

Fixes #1402

See merge request !946
parents 7aa8bfc1 3b5722bc
...@@ -4,22 +4,22 @@ class Groups::MilestonesController < ApplicationController ...@@ -4,22 +4,22 @@ class Groups::MilestonesController < ApplicationController
before_filter :authorize_group_milestone!, only: :update before_filter :authorize_group_milestone!, only: :update
def index def index
project_milestones = Milestone.where(project_id: group.projects) project_milestones = case params[:status]
@group_milestones = Milestones::GroupService.new(project_milestones).execute when 'all'; status
@group_milestones = case params[:status]
when 'all'; @group_milestones
when 'closed'; status('closed') when 'closed'; status('closed')
else status('active') else status('active')
end end
@group_milestones = Milestones::GroupService.new(project_milestones).execute
@group_milestones = Kaminari.paginate_array(@group_milestones).page(params[:page]).per(30)
end end
def show def show
project_milestones = Milestone.where(project_id: group.projects) project_milestones = Milestone.where(project_id: group.projects).order("due_date ASC")
@group_milestone = Milestones::GroupService.new(project_milestones).milestone(title) @group_milestone = Milestones::GroupService.new(project_milestones).milestone(title)
end end
def update def update
project_milestones = Milestone.where(project_id: group.projects) project_milestones = Milestone.where(project_id: group.projects).order("due_date ASC")
@group_milestones = Milestones::GroupService.new(project_milestones).milestone(title) @group_milestones = Milestones::GroupService.new(project_milestones).milestone(title)
@group_milestones.milestones.each do |milestone| @group_milestones.milestones.each do |milestone|
...@@ -44,8 +44,10 @@ class Groups::MilestonesController < ApplicationController ...@@ -44,8 +44,10 @@ class Groups::MilestonesController < ApplicationController
params[:title] params[:title]
end end
def status(state) def status(state = nil)
@group_milestones.map{ |milestone| next if milestone.state != state; milestone }.compact conditions = { project_id: group.projects }
conditions.reverse_merge!(state: state) if state
Milestone.where(conditions).order("title ASC")
end end
def authorize_group_milestone! def authorize_group_milestone!
......
...@@ -47,3 +47,4 @@ ...@@ -47,3 +47,4 @@
- milestone.projects.each do |project| - milestone.projects.each do |project|
%span.label.label-default %span.label.label-default
= project.name = project.name
= paginate @group_milestones, theme: "gitlab"
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment