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

uploads: fixup bugs in 65a17979c and 05143dc9f.

Browse Source 
* Fix exception in 65a17979c due to reference to `@media_asset` instead of `media_asset.
* Fix 05143dc9f not removing links to deleted images on the upload page.
This commit is contained in:
evazion
2022-11-29 22:41:42 -06:00
parent 65a17979c6
commit 6b109af7bb
1 changed files with 67 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

132
app/views/uploads/_single_asset_upload.html.erb
View File

@@ -25,74 +25,76 @@
<div id="upload-image"> <div id="upload-image">
<%= render MediaAssetComponent.new(media_asset: media_asset, current_user: CurrentUser.user) %> <%= render MediaAssetComponent.new(media_asset: media_asset, current_user: CurrentUser.user) %>
<div class="flex flex-none gap-2 h-6 items-center text-xs"> <% if policy(media_asset).can_see_image? %>
<% if media_asset.source_urls.present? %> <div class="flex flex-none gap-2 h-6 items-center text-xs">
<% if media_asset.source_urls.present? %>
<span>
<% media_asset.source_urls.take(5).each do |url| %>
<%= external_link_to url, external_site_icon(Source::URL.site_name(url), class: "h-4"), title: url, class: "inline-block align-top" %>
<% end %>
</span>
<% end %>
<%= link_to media_asset do %>
<%= number_to_human_size(media_asset.file_size) %> .<%= media_asset.file_ext %>,
<%= media_asset.image_width %>x<%= media_asset.image_height %>
<% if media_asset.duration.present? %>
(<%= duration_to_hhmmss(media_asset.duration) %>)
<% end %>
<% end %>
<span> <span>
<% media_asset.source_urls.take(5).each do |url| %> <%= render PopupMenuComponent.new(hide_on_click: false) do |menu| %>
<%= external_link_to url, external_site_icon(Source::URL.site_name(url), class: "h-4"), title: url, class: "inline-block align-top" %> <% menu.item(hide_on_click: true) do %>
<%= link_to "#{media_asset.original.file_url}?download=1", download: media_asset.original.file_name do %>
<%= download_icon %> Download
<% end %>
<% end %>
<% menu.item do %>
<hr class="border">
<% end %>
<% menu.item do %>
<%= external_link_to "https://saucenao.com/search.php?url=#{CGI.escape(media_asset.original.file_url)}", target: "_blank" do %>
<%= search_icon %> SauceNAO
<% end %>
<% end %>
<% menu.item do %>
<%= external_link_to "https://ascii2d.net/search/url/#{CGI.escape(media_asset.original.file_url)}", target: "_blank" do %>
<%= search_icon %> Ascii2D
<% end %>
<% end %>
<% menu.item do %>
<%= external_link_to "https://yandex.com/images/search?rpt=imageview&url=#{CGI.escape(media_asset.original.file_url)}", target: "_blank" do %>
<%= search_icon %> Yandex
<% end %>
<% end %>
<% menu.item do %>
<%= external_link_to "https://lens.google.com/uploadbyurl?url=#{CGI.escape(media_asset.original.file_url)}", target: "_blank" do %>
<%= search_icon %> Google
<% end %>
<% end %>
<% menu.item do %>
<%= external_link_to "https://www.bing.com/images/searchbyimage?cbir=sbi&imgurl=#{CGI.escape(media_asset.original.file_url)}", target: "_blank" do %>
<%= search_icon %> Bing
<% end %>
<% end %>
<% menu.item do %>
<%= link_to iqdb_queries_path(search: { media_asset_id: media_asset.id }), target: "_blank" do %>
<%= search_icon %> <%= Danbooru.config.app_name %>
<% end %>
<% end %>
<% end %> <% end %>
</span> </span>
<% end %> </div>
<% end %>
<%= link_to media_asset do %>
<%= number_to_human_size(media_asset.file_size) %> .<%= media_asset.file_ext %>,
<%= media_asset.image_width %>x<%= media_asset.image_height %>
<% if media_asset.duration.present? %>
(<%= duration_to_hhmmss(media_asset.duration) %>)
<% end %>
<% end %>
<span>
<%= render PopupMenuComponent.new(hide_on_click: false) do |menu| %>
<% menu.item(hide_on_click: true) do %>
<%= link_to "#{media_asset.original.file_url}?download=1", download: media_asset.original.file_name do %>
<%= download_icon %> Download
<% end %>
<% end %>
<% menu.item do %>
<hr class="border">
<% end %>
<% menu.item do %>
<%= external_link_to "https://saucenao.com/search.php?url=#{CGI.escape(media_asset.original.file_url)}", target: "_blank" do %>
<%= search_icon %> SauceNAO
<% end %>
<% end %>
<% menu.item do %>
<%= external_link_to "https://ascii2d.net/search/url/#{CGI.escape(@media_asset.original.file_url)}", target: "_blank" do %>
<%= search_icon %> Ascii2D
<% end %>
<% end %>
<% menu.item do %>
<%= external_link_to "https://yandex.com/images/search?rpt=imageview&url=#{CGI.escape(media_asset.original.file_url)}", target: "_blank" do %>
<%= search_icon %> Yandex
<% end %>
<% end %>
<% menu.item do %>
<%= external_link_to "https://lens.google.com/uploadbyurl?url=#{CGI.escape(media_asset.original.file_url)}", target: "_blank" do %>
<%= search_icon %> Google
<% end %>
<% end %>
<% menu.item do %>
<%= external_link_to "https://www.bing.com/images/searchbyimage?cbir=sbi&imgurl=#{CGI.escape(media_asset.original.file_url)}", target: "_blank" do %>
<%= search_icon %> Bing
<% end %>
<% end %>
<% menu.item do %>
<%= link_to iqdb_queries_path(search: { media_asset_id: media_asset.id }), target: "_blank" do %>
<%= search_icon %> <%= Danbooru.config.app_name %>
<% end %>
<% end %>
<% end %>
</span>
</div>
</div> </div>
<%= render "uploads/related_posts", source: upload_media_asset.source_extractor %> <%= render "uploads/related_posts", source: upload_media_asset.source_extractor %>