From ecf160dcd8c1961691952484413c76e93524a8ac Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Sat, 8 Feb 2020 20:02:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=A1=B5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/application_controller.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index aaf8ecabf..411481f0e 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -634,7 +634,8 @@ class ApplicationController < ActionController::Base
 	end
 
 	def paginate(relation)
-		limit  = (params[:limit].to_i.zero? || params[:limit].to_i > 20) ? 20 : params[:limit].to_i
+		limit = params[:limit] || params[:per_page]
+		limit  = (limit.to_i.zero? || limit.to_i > 20) ? 20 : limit.to_i
 		page   = params[:page].to_i.zero? ? 1 : params[:page].to_i
 		offset = (page - 1) * limit
 
@@ -645,6 +646,8 @@ class ApplicationController < ActionController::Base
 		end
 	end
 
+
+
 	def strf_time(time)
 		time.blank? ? '' : time.strftime("%Y-%m-%d %H:%M:%S")
 	end