Use respond_to instead of a conditional to paginate milestones
This commit is contained in:
parent
7dc16346bb
commit
e989d12b07
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue