floraachy/gitlink-forgeplus
1
0
Fork 0
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git synced 2026-05-24 21:55:46 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into standalone_develop

Browse Source
This commit is contained in:
yystopf
2023-03-06 17:49:36 +08:00
parent 8a67c19c67 620ed26e45
commit de6ff8d863
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/api/v1/base_controller.rb
View File

@@ -23,7 +23,7 @@ class Api::V1::BaseController < ApplicationController
def kaminary_select_paginate(relation) def kaminary_select_paginate(relation)
limit = params[:limit] || params[:per_page] limit = params[:limit] || params[:per_page]
limit = (limit.to_i.zero? || limit.to_i > 100) ? 100 : limit.to_i limit = (limit.to_i.zero? || limit.to_i > 200) ? 200 : limit.to_i
page = params[:page].to_i.zero? ? 1 : params[:page].to_i page = params[:page].to_i.zero? ? 1 : params[:page].to_i
relation.page(page).per(limit) relation.page(page).per(limit)

2
app/controllers/api/v1/issues/journals_controller.rb
View File

@@ -10,7 +10,7 @@ class Api::V1::Issues::JournalsController < Api::V1::BaseController
@total_journals_count = @object_result[:total_journals_count] @total_journals_count = @object_result[:total_journals_count]
@total_operate_journals_count = @object_result[:total_operate_journals_count] @total_operate_journals_count = @object_result[:total_operate_journals_count]
@total_comment_journals_count = @object_result[:total_comment_journals_count] @total_comment_journals_count = @object_result[:total_comment_journals_count]
@journals = kaminari_paginate(@object_result[:data]) @journals = kaminary_select_paginate(@object_result[:data])
end end
def create def create