Updated milestone count helper plus tests

2 files changed, 4 insertions, 4 deletions

diff --git a/app/helpers/milestones_helper.rb b/app/helpers/milestones_helper.rb
index 22d8ecd3ecb..404a116d951 100644
--- a/app/helpers/milestones_helper.rb
+++ b/app/helpers/milestones_helper.rb
@@ -38,12 +38,12 @@ module MilestonesHelper
   # Returns count of milestones for different states
   # Uses explicit hash keys as the 'opened' state URL params differs from the db value 
   # and we need to add the total
-  def milestone_counts(project:)
-    counts = @project.milestones.reorder(nil).group(:state).count()
+  def milestone_counts(milestones)
+    counts = milestones.reorder(nil).group(:state).count
     {
       opened: counts['active'],
       closed: counts['closed'],
-      all: counts['active'] + counts['closed']
+      all: counts.values.sum
     }
   end
 
diff --git a/app/views/shared/_milestones_filter.html.haml b/app/views/shared/_milestones_filter.html.haml
index a2b17a94f80..4167f03da64 100644
--- a/app/views/shared/_milestones_filter.html.haml
+++ b/app/views/shared/_milestones_filter.html.haml
@@ -1,4 +1,4 @@
-- counts = milestone_counts(project: @project)
+- counts = milestone_counts(@project.milestones)
 
 %ul.nav-links
   %li{class: ("active" if params[:state].blank? || params[:state] == 'opened')}