From e989d12b0768f0caa7ea1a429a2182e26bbf225a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Wed, 23 Mar 2016 09:09:58 +0100
Subject: [PATCH] Use respond_to instead of a conditional to paginate
 milestones

---
 app/controllers/concerns/global_milestones.rb      | 4 ----
 app/controllers/dashboard/milestones_controller.rb | 7 ++++---
 app/controllers/groups/milestones_controller.rb    | 6 +++++-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/controllers/concerns/global_milestones.rb b/app/controllers/concerns/global_milestones.rb
index f5eace47df4..5c503c5b698 100644
--- a/app/controllers/concerns/global_milestones.rb
+++ b/app/controllers/concerns/global_milestones.rb
@@ -6,10 +6,6 @@ module GlobalMilestones
     @milestones = MilestonesFinder.new.execute(@projects, params)
     @milestones = GlobalMilestone.build_collection(@milestones)
     @milestones = @milestones.sort_by { |x| x.due_date.nil? ? epoch : x.due_date }
-
-    if request.format == :html
-      @milestones = Kaminari.paginate_array(@milestones).page(params[:page])
-    end
   end
 
   def milestone
diff --git a/app/controllers/dashboard/milestones_controller.rb b/app/controllers/dashboard/milestones_controller.rb
index 0a4a4088404..fa9c6c054f0 100644
--- a/app/controllers/dashboard/milestones_controller.rb
+++ b/app/controllers/dashboard/milestones_controller.rb
@@ -2,14 +2,15 @@ class Dashboard::MilestonesController < Dashboard::ApplicationController
   include GlobalMilestones
 
   before_action :projects
-  before_action :milestones, only: [:index]
   before_action :milestone, only: [:show]
 
   def index
     respond_to do |format|
-      format.html
+      format.html do
+        @milestones = Kaminari.paginate_array(milestones).page(params[:page])
+      end
       format.json do
-        render json: @milestones
+        render json: milestones
       end
     end
   end
diff --git a/app/controllers/groups/milestones_controller.rb b/app/controllers/groups/milestones_controller.rb
index 0028f072d5b..b23c3022fb5 100644
--- a/app/controllers/groups/milestones_controller.rb
+++ b/app/controllers/groups/milestones_controller.rb
@@ -2,11 +2,15 @@ class Groups::MilestonesController < Groups::ApplicationController
   include GlobalMilestones
 
   before_action :group_projects
-  before_action :milestones, only: [:index]
   before_action :milestone, only: [:show, :update]
   before_action :authorize_admin_milestones!, only: [:new, :create, :update]
 
   def index
+    respond_to do |format|
+      format.html do
+        @milestones = Kaminari.paginate_array(milestones).page(params[:page])
+      end
+    end
   end
 
   def new