From 30940ccf8a7adda1b51172d6dc68e114f4ca44cd Mon Sep 17 00:00:00 2001 From: evazion Date: Fri, 4 Feb 2022 01:01:32 -0600 Subject: [PATCH] uploads: fix incorrect sources on /uploads?mode=gallery page. 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. --- app/views/uploads/_gallery.html.erb | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/app/views/uploads/_gallery.html.erb b/app/views/uploads/_gallery.html.erb index 0683ae0dd..a0c894fe1 100644 --- a/app/views/uploads/_gallery.html.erb +++ b/app/views/uploads/_gallery.html.erb @@ -9,9 +9,9 @@ <%= render(MediaAssetGalleryComponent.new) do |gallery| %> <% @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 %>
<% if media_asset.post.present? %> @@ -20,12 +20,11 @@
<% end %> - <% if @upload.source.present? %> - <%= external_link_to @upload.source, Addressable::URI.parse(@upload.source).domain %> + <% if upload.source.present? %> + <%= external_link_to upload.source, Addressable::URI.parse(upload.source).domain %> <% else %> No source <% end %> - <% end %> <% end %>