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

uploads: fix incorrect sources on /uploads?mode=gallery page.

Browse Source 
Fix bug in 2c0feaf94 that caused all the assets on the /uploads?mode=gallery
page to show the same source. The loop clobbered the `@upload` variable
such that the value from the last iteration was used by all assets.
This commit is contained in:
evazion
2022-02-04 01:01:32 -06:00
parent b3405d4947
commit 30940ccf8a
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/views/uploads/_gallery.html.erb
View File

@@ -9,9 +9,9 @@
<%= render(MediaAssetGalleryComponent.new) do |gallery| %> <%= render(MediaAssetGalleryComponent.new) do |gallery| %>
<% @media_assets.each do |media_asset| %> <% @media_assets.each do |media_asset| %>
<% @upload = media_asset.uploads.order(id: :desc).select { |upload| upload.uploader == CurrentUser.user }.first %> <% upload = media_asset.uploads.order(id: :desc).select { |upload| upload.uploader == CurrentUser.user }.first %>
<% gallery.media_asset(media_asset: media_asset, size: gallery.size, link_target: media_asset.post || @upload) do |preview| %> <% gallery.media_asset(media_asset: media_asset, size: gallery.size, link_target: media_asset.post || upload) do |preview| %>
<% preview.footer do %> <% preview.footer do %>
<div class="text-center text-muted text-xs h-12"> <div class="text-center text-muted text-xs h-12">
<% if media_asset.post.present? %> <% if media_asset.post.present? %>
@@ -20,12 +20,11 @@
</div> </div>
<% end %> <% end %>
<% if @upload.source.present? %> <% if upload.source.present? %>
<%= external_link_to @upload.source, Addressable::URI.parse(@upload.source).domain %> <%= external_link_to upload.source, Addressable::URI.parse(upload.source).domain %>
<% else %> <% else %>
<em>No source</em> <em>No source</em>
<% end %> <% end %>
</div> </div>
<% end %> <% end %>
<% end %> <% end %>