From 1a2e11c891ef4a2a87b84f2b0b36316bb809ff14 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Wed, 25 Dec 2013 09:19:51 +0200 Subject: Fix per-project counters for Dashboard filters Signed-off-by: Dmitriy Zaporozhets --- app/helpers/dashboard_helper.rb | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'app/helpers/dashboard_helper.rb') diff --git a/app/helpers/dashboard_helper.rb b/app/helpers/dashboard_helper.rb index cbc8c336bea..d93eac407b7 100644 --- a/app/helpers/dashboard_helper.rb +++ b/app/helpers/dashboard_helper.rb @@ -14,17 +14,11 @@ module DashboardHelper end def entities_per_project(project, entity) - items = project.items_for(entity) - - items = case params[:status] - when 'closed' - items.closed - when 'all' - items - else - items.opened - end - - items.cared(current_user).count + case entity.to_sym + when :issue then @issues.where(project_id: project.id) + when :merge_request then @merge_requests.where(target_project_id: project.id) + else + [] + end.count end end -- cgit v1.2.1