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

2
app/views/upload_media_assets/_gallery.html.erb
View File

@@ -1,4 +1,4 @@
<%= render(MediaAssetGalleryComponent.new(classes: ["upload-media-asset-gallery"])) do |gallery| %>
<%= render(MediaAssetGalleryComponent.new(classes: ["upload-media-asset-gallery"], size: size)) do |gallery| %>
<% upload_media_assets.each do |upload_media_asset| %>
<% gallery.media_asset do %>
<%= render "upload_media_assets/preview", upload_media_asset: upload_media_asset, size: gallery.size %>

12
app/views/upload_media_assets/_preview.html.erb
View File

@@ -10,18 +10,12 @@
<% end %>
<% preview.footer do %>
<div class="text-center text-muted text-xs h-12">
<% if media_asset&.post.present? %>
<div class="text-center text-xs h-8">
<% if upload_media_asset.post.present? %>
<div class="leading-none">
<%= link_to "post ##{media_asset.post.id}", media_asset.post, class: "leading-none" %>
<%= link_to "post ##{upload_media_asset.post.id}", upload_media_asset.post, class: "leading-none" %>
</div>
<% end %>
<% if upload_media_asset.source_url.present? %>
<%= external_link_to upload_media_asset.source_url, Addressable::URI.parse(upload_media_asset.source_url).domain %>
<% else %>
<em>No source</em>
<% end %>
</div>
<% end %>
<% end %>

21
app/views/upload_media_assets/index.html.erb
View File

@@ -1,16 +1,23 @@
<div id="c-upload-media-assets">
<div id="a-index">
<div class="flex items-center mb-2">
<h1 class="flex-1">My Uploads</h1>
<h1>Upload</h1>
<span>
<strong>Gallery</strong> |
<%= link_to "Table", user_uploads_path(CurrentUser.user.id.to_i, mode: "table") %>
</span>
<% if policy(@upload).show? && @upload.source_strategy.present? %>
<%= render_source_data(@upload.source_strategy) %>
<% end %>
<div class="border-b mb-4 flex flex-wrap gap-4">
<%= link_to "All", current_page_path(search: search_params.to_h.without("is_posted")), class: ["inline-block p-1 pb-2", (search_params[:is_posted].nil? ? "border-current border-b-2 -mb-px" : "inactive-link")] %>
<%= link_to "Posted", current_page_path(search: { is_posted: true }), class: ["inline-block p-1 pb-2", (search_params[:is_posted].to_s.truthy? ? "border-current border-b-2 -mb-px" : "inactive-link")] %>
<%= link_to "Unposted", current_page_path(search: { is_posted: false }), class: ["inline-block p-1 pb-2", (search_params[:is_posted].to_s.falsy? ? "border-current border-b-2 -mb-px" : "inactive-link")] %>
<span class="flex-1"></span>
<%= render PreviewSizeMenuComponent.new(current_size: @preview_size) %>
</div>
<%= render "upload_media_assets/gallery", upload_media_assets: @upload_media_assets %>
<%= render "upload_media_assets/gallery", upload_media_assets: @upload_media_assets, size: @preview_size %>
<%= numbered_paginator(@upload_media_assets) %>
</div>
</div>
<%= render "uploads/secondary_links" %>