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

Fix #4986: Add ability to filter images in /media_assets and /uploads depending on if they have become posts

Browse Source
This commit is contained in:
evazion
2022-02-18 00:14:47 -06:00
parent f54fac74c8
commit 093a808a36
16 changed files with 121 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/controllers/upload_media_assets_controller.rb
View File

@@ -4,7 +4,14 @@ class UploadMediaAssetsController < ApplicationController
respond_to :html, :xml, :json, :js
def index
@upload_media_assets = authorize UploadMediaAsset.visible(CurrentUser.user).includes(media_asset: :post, upload: :uploader).where(upload: { uploader: CurrentUser.user }).paginated_search(params, count_pages: true)
@defaults = { upload_id: params[:upload_id] }
@defaults[:order] = "id_asc" if params[:upload_id].present?
@limit = params.fetch(:limit, 200).to_i.clamp(0, PostSets::Post::MAX_PER_PAGE)
@preview_size = params[:size].presence || cookies[:post_preview_size].presence || MediaAssetGalleryComponent::DEFAULT_SIZE
@upload = Upload.find(params[:upload_id]) if params[:upload_id].present?
@upload_media_assets = authorize UploadMediaAsset.visible(CurrentUser.user).includes(:post, :media_asset, upload: :uploader).paginated_search(params, limit: @limit, count_pages: true, defaults: @defaults)
respond_with(@upload_media_assets)
end