From a044e59a68ae99a3c003fa7e0550b69d7e52c361 Mon Sep 17 00:00:00 2001 From: xxq250 Date: Tue, 21 May 2024 09:10:05 +0800 Subject: [PATCH] =?UTF-8?q?fixed=20=E5=90=88=E5=B9=B6=E4=B8=BB=E5=B9=B2?= =?UTF-8?q?=E6=89=80=E6=9C=89=E4=BB=A3=E7=A0=81,=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/application_controller.rb | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 8960b0269..a9464974d 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -630,7 +630,15 @@ 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 > 50) ? 50 : limit.to_i + page = params[:page].to_i.zero? ? 1 : params[:page].to_i + + relation.page(page).per(limit) + end + + def kaminari_unlimit_paginate(relation) + limit = params[:limit] || params[:per_page] + limit = (limit.to_i.zero? || limit.to_i > 9999) ? 9999 : limit.to_i page = params[:page].to_i.zero? ? 1 : params[:page].to_i relation.page(page).per(limit)