Merge branch 'develop' into standalone_develop

2023-03-24 14:37:49 +08:00 · 2023-03-24 14:37:49 +08:00 · 76028a71f0
parent 22929e54d3 01467a3d2a
commit 76028a71f0
1 changed files with 1 additions and 1 deletions
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@ -680,7 +680,7 @@ class ApplicationController < ActionController::Base
 		relation.page(page).per(limit)
 	end

-	def kaminari_unlimit_paginate(ralation)
+	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