1 files changed, 6 insertions, 3 deletions
diff --git a/app/controllers/groups/milestones_controller.rb b/app/controllers/groups/milestones_controller.rb
index c46f20cc0e1..305c0181aa2 100644
--- a/app/controllers/groups/milestones_controller.rb
+++ b/app/controllers/groups/milestones_controller.rb
@@ -8,7 +8,7 @@ class Groups::MilestonesController < Groups::ApplicationController
   def index
     respond_to do |format|
       format.html do
-        @milestone_states = GlobalMilestone.states_count(@projects)
+        @milestone_states = GlobalMilestone.states_count(@projects, group)
         @milestones = Kaminari.paginate_array(milestones).page(params[:page])
       end
     end
@@ -65,11 +65,14 @@ class Groups::MilestonesController < Groups::ApplicationController
     @project_milestones = Milestone.where(project_id: group.projects.pluck(:id))
 
     @group_milestones + @project_milestones
+    #@milestones = GroupMilestone.build_collection(@group, @projects, params)
   end
 
   def milestone
-    # Use a finder here
-    @milestone = @group.milestones.find_by_title(params[:title])
+    @milestone =
+      @group.milestones.find_by_title(params[:title]) ||
+      GroupMilestone.build(@group, @projects, params[:title])
+
     render_404 unless @milestone
   end
 end