From 8e8c074205f4c85238309f4e21e80748f09d0ec8 Mon Sep 17 00:00:00 2001
From: Marin Jankovski <marin@gitlab.com>
Date: Thu, 26 Jun 2014 09:41:36 +0200
Subject: [PATCH] Reuse existing milestones counting.

---
 app/services/milestones/group_service.rb    | 4 ++--
 app/views/groups/milestones/index.html.haml | 2 +-
 app/views/layouts/nav/_group.html.haml      | 4 +---
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/services/milestones/group_service.rb b/app/services/milestones/group_service.rb
index 1655100e012..74bf126652e 100644
--- a/app/services/milestones/group_service.rb
+++ b/app/services/milestones/group_service.rb
@@ -44,11 +44,11 @@ module Milestones
     end
 
     def open_items_count
-      open_issues_count.merge(open_mr_count){ |title,issue,mr| issue + mr }
+      @project_milestones.merge(@project_milestones){ |title, milestone| milestone.map{|m| m.open_items_count }.sum }
     end
 
     def closed_items_count
-      closed_issues_count.merge(close_mr_count){ |title,issue,mr| issue + mr }
+      @project_milestones.merge(@project_milestones){ |title, milestone| milestone.map{|m| m.closed_items_count }.sum }
     end
 
     def total_items_count
diff --git a/app/views/groups/milestones/index.html.haml b/app/views/groups/milestones/index.html.haml
index b5d68153a9a..2e51d74ca88 100644
--- a/app/views/groups/milestones/index.html.haml
+++ b/app/views/groups/milestones/index.html.haml
@@ -1,6 +1,6 @@
 %h3.page-title
   Milestones
-  %span.pull-right milestones
+  %span.pull-right #{@group_milestones.titles.count} milestones
 
 %p.light
   Only milestones from
diff --git a/app/views/layouts/nav/_group.html.haml b/app/views/layouts/nav/_group.html.haml
index 5fa14bd0d9b..429848e3cbd 100644
--- a/app/views/layouts/nav/_group.html.haml
+++ b/app/views/layouts/nav/_group.html.haml
@@ -13,10 +13,8 @@
       - if current_user
         %span.count= current_user.cared_merge_requests.opened.of_group(@group).count
   = nav_link(path: 'groups#milestones') do
-    = link_to merge_requests_group_path(@group) do
+    = link_to group_milestones_path(@group) do
       Milestones
-      - if current_user
-        %span.count= current_user.cared_merge_requests.opened.of_group(@group).count
   = nav_link(path: 'groups#members') do
     = link_to "Members", members_group_path(@group)