diff --git a/app/controllers/admins/topic/cooperators_controller.rb b/app/controllers/admins/topic/cooperators_controller.rb index fdd47e712..a1a700cbc 100644 --- a/app/controllers/admins/topic/cooperators_controller.rb +++ b/app/controllers/admins/topic/cooperators_controller.rb @@ -2,7 +2,7 @@ class Admins::Topic::CooperatorsController < Admins::Topic::BaseController before_action :find_cooperator, only: [:edit, :update, :destroy] def index - @cooperators = kaminari_paginate(::Topic::Cooperator) + @cooperators = paginate(::Topic::Cooperator) end def new diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 3f0fbcc7d..4a72f83ca 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -682,7 +682,7 @@ class ApplicationController < ActionController::Base def kaminari_paginate(relation) limit = params[:limit] || params[:per_page] - limit = (limit.to_i.zero? || limit.to_i > 15) ? 15 : limit.to_i + limit = (limit.to_i.zero? || limit.to_i > 20) ? 20 : limit.to_i page = params[:page].to_i.zero? ? 1 : params[:page].to_i relation.page(page).per(limit) @@ -690,7 +690,7 @@ class ApplicationController < ActionController::Base def kaminari_array_paginate(relation) limit = params[:limit] || params[:per_page] - limit = (limit.to_i.zero? || limit.to_i > 15) ? 15 : limit.to_i + limit = (limit.to_i.zero? || limit.to_i > 20) ? 20 : limit.to_i page = params[:page].to_i.zero? ? 1 : params[:page].to_i Kaminari.paginate_array(relation).page(page).per(limit) diff --git a/app/views/admins/topic/banners/_list.html.erb b/app/views/admins/topic/banners/_list.html.erb index b3df7cf0b..aa366ec21 100644 --- a/app/views/admins/topic/banners/_list.html.erb +++ b/app/views/admins/topic/banners/_list.html.erb @@ -14,7 +14,7 @@