diff options
| author | Ronald van Zon <rvzon84@gmail.com> | 2018-08-30 14:17:36 +0000 |
|---|---|---|
| committer | Eagllus <rvanzon@gitlab.com> | 2018-10-04 08:54:23 +0200 |
| commit | 3cd511733b5b646becfdf72e36062b863dfbcf20 (patch) | |
| tree | 364b8e7bf9421bb91c506749fa292485d0bef214 /app/controllers/dashboard | |
| parent | a5cfacc281855e3d2f1da4b08d4579a089c3d311 (diff) | |
| download | gitlab-ce-3cd511733b5b646becfdf72e36062b863dfbcf20.tar.gz | |
Fixing count on Milestones
By adding groups to milestones we can now include them
in the count of Open and Closed.
Diffstat (limited to 'app/controllers/dashboard')
| -rw-r--r-- | app/controllers/dashboard/application_controller.rb | 4 | ||||
| -rw-r--r-- | app/controllers/dashboard/milestones_controller.rb | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/controllers/dashboard/application_controller.rb b/app/controllers/dashboard/application_controller.rb index cee0753a021..1c9a5917da5 100644 --- a/app/controllers/dashboard/application_controller.rb +++ b/app/controllers/dashboard/application_controller.rb @@ -12,4 +12,8 @@ class Dashboard::ApplicationController < ApplicationController def projects @projects ||= current_user.authorized_projects.sorted_by_activity.non_archived end + + def groups + @groups ||= GroupsFinder.new(current_user, state_all: true).execute + end end diff --git a/app/controllers/dashboard/milestones_controller.rb b/app/controllers/dashboard/milestones_controller.rb index 6e17bc212e4..ddc1a66d11d 100644 --- a/app/controllers/dashboard/milestones_controller.rb +++ b/app/controllers/dashboard/milestones_controller.rb @@ -4,12 +4,13 @@ class Dashboard::MilestonesController < Dashboard::ApplicationController include MilestoneActions before_action :projects + before_action :groups before_action :milestone, only: [:show, :merge_requests, :participants, :labels] def index respond_to do |format| format.html do - @milestone_states = GlobalMilestone.states_count(@projects) + @milestone_states = GlobalMilestone.states_count(@projects, @groups) @milestones = Kaminari.paginate_array(milestones).page(params[:page]) end format.json do |