jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

uploads: respect user's posts-per-page setting on My Uploads page.

Browse Source
This commit is contained in:
evazion
2022-02-16 13:55:08 -06:00
parent 7c3586f985
commit f890e8595e
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/media_assets_controller.rb
View File

@@ -4,7 +4,8 @@ class MediaAssetsController < ApplicationController
respond_to :html, :json, :xml
def index
@media_assets = authorize MediaAsset.visible(CurrentUser.user).paginated_search(params, count_pages: false)
@limit = params.fetch(:limit, CurrentUser.user.per_page).to_i.clamp(0, PostSets::Post::MAX_PER_PAGE)
@media_assets = authorize MediaAsset.visible(CurrentUser.user).paginated_search(params, limit: @limit, count_pages: false)
@media_assets = @media_assets.includes(:media_metadata, :post)
respond_with(@media_assets)
end

4
app/controllers/uploads_controller.rb
View File

@@ -34,7 +34,9 @@ class UploadsController < ApplicationController
@defaults = {}
@defaults[:uploader_id] = params[:user_id]
@defaults[:status] = "completed" if request.format.html?
@uploads = authorize Upload.visible(CurrentUser.user).paginated_search(params, count_pages: true, defaults: @defaults)
@limit = params.fetch(:limit, CurrentUser.user.per_page).to_i.clamp(0, PostSets::Post::MAX_PER_PAGE)
@uploads = authorize Upload.visible(CurrentUser.user).paginated_search(params, limit: @limit, count_pages: true, defaults: @defaults)
@uploads = @uploads.includes(:uploader, media_assets: :post, upload_media_assets: { media_asset: :post }) if request.format.html?
respond_with(@uploads, include: { upload_media_assets: { include: :media_asset }})