diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-03-03 16:19:37 +0100 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-03-03 16:19:37 +0100 |
commit | fbc3cb69c327e52a002c7909c257c43c9a2f5ba5 (patch) | |
tree | 7a42aac8eb05242dde9cf529f5537a4aa91d3703 /app/controllers/groups | |
parent | 2f4656b5c7e2a9b351237432e76a7b928a1684b1 (diff) | |
download | gitlab-ce-fbc3cb69c327e52a002c7909c257c43c9a2f5ba5.tar.gz |
Add dashboard milestones.
Diffstat (limited to 'app/controllers/groups')
-rw-r--r-- | app/controllers/groups/milestones_controller.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/controllers/groups/milestones_controller.rb b/app/controllers/groups/milestones_controller.rb index 860d8e03922..6802e529b54 100644 --- a/app/controllers/groups/milestones_controller.rb +++ b/app/controllers/groups/milestones_controller.rb @@ -4,10 +4,10 @@ class Groups::MilestonesController < ApplicationController before_filter :authorize_group_milestone!, only: :update def index - project_milestones = case params[:status] - when 'all'; status - when 'closed'; status('closed') - else status('active') + project_milestones = case params[:state] + when 'all'; state + when 'closed'; state('closed') + else state('active') end @group_milestones = Milestones::GroupService.new(project_milestones).execute @group_milestones = Kaminari.paginate_array(@group_milestones).page(params[:page]).per(30) @@ -44,7 +44,7 @@ class Groups::MilestonesController < ApplicationController params[:title] end - def status(state = nil) + def state(state = nil) conditions = { project_id: group.projects } conditions.reverse_merge!(state: state) if state Milestone.where(conditions).order("title ASC") |