floraachy/gitlink-forgeplus
1
0
Fork 0
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git synced 2026-05-16 09:45:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: paginate and img width

Browse Source
This commit is contained in:
yystopf
2021-11-03 11:38:47 +08:00
parent 18bbbce7b3
commit a3f57d3cbc
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/admins/topic/cooperators_controller.rb
View File

@@ -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

4
app/controllers/application_controller.rb
View File

@@ -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)