From f890e8595ed955971e42ea9868cba900b9ba4eaa Mon Sep 17 00:00:00 2001 From: evazion Date: Wed, 16 Feb 2022 13:55:08 -0600 Subject: [PATCH] uploads: respect user's posts-per-page setting on My Uploads page. --- app/controllers/media_assets_controller.rb | 3 ++- app/controllers/uploads_controller.rb | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/controllers/media_assets_controller.rb b/app/controllers/media_assets_controller.rb index f12d29830..d1a121daf 100644 --- a/app/controllers/media_assets_controller.rb +++ b/app/controllers/media_assets_controller.rb @@ -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 diff --git a/app/controllers/uploads_controller.rb b/app/controllers/uploads_controller.rb index 7b45e057f..826b17c13 100644 --- a/app/controllers/uploads_controller.rb +++ b/app/controllers/uploads_controller.rb @@ -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 }})