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

4
app/controllers/uploads_controller.rb
View File

@@ -38,7 +38,7 @@ class UploadsController < ApplicationController
@preview_size = params[:size].presence || cookies[:post_preview_size].presence || MediaAssetGalleryComponent::DEFAULT_SIZE
@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?
@uploads = @uploads.includes(:uploader, :posts, upload_media_assets: :media_asset) if request.format.html?
respond_with(@uploads, include: { upload_media_assets: { include: :media_asset }})
end
@@ -50,6 +50,8 @@ class UploadsController < ApplicationController
if request.format.html? && @upload.media_asset_count == 1 && @upload.media_assets.first&.post.present?
flash[:notice] = "Duplicate of post ##{@upload.media_assets.first.post.id}"
redirect_to @upload.media_assets.first.post
elsif request.format.html? && @upload.media_asset_count > 1
redirect_to [@upload, UploadMediaAsset]
else
respond_with(@upload, include: { upload_media_assets: { include: :media_asset }})
end