From 70f8d3d0c0287a9bed51794563e41301960f2279 Mon Sep 17 00:00:00 2001 From: evazion Date: Wed, 16 Feb 2022 01:18:37 -0600 Subject: [PATCH] uploads: autorefresh /uploads/:id page if upload is still processing. Fixes an issue where if you were uploading a multi-image source, and you clicked on a thumbnail that was still processing, then the page wouldn't refresh when the processing was complete. --- app/views/uploads/_single_asset_upload.html.erb | 8 +++++--- app/views/uploads/show.html.erb | 4 ++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/views/uploads/_single_asset_upload.html.erb b/app/views/uploads/_single_asset_upload.html.erb index 8af446735..6f4e01741 100644 --- a/app/views/uploads/_single_asset_upload.html.erb +++ b/app/views/uploads/_single_asset_upload.html.erb @@ -2,10 +2,12 @@

You have reached your upload limit. Please wait for your pending uploads to be approved before uploading more.

Upload Limit: <%= render "users/upload_limit", user: CurrentUser.user %>

-<% elsif upload_media_asset.pending? %> -

Preparing to upload <%= external_link_to upload_media_asset.source_url %>...

-<% elsif upload_media_asset.processing? %> +<% elsif upload_media_asset.loading? %>

Processing <%= external_link_to upload_media_asset.source_url %>...

+ + <% content_for(:html_header) do %> + + <% end %> <% elsif upload_media_asset.failed? %>

Error: <%= upload_media_asset.error %>.

<% else %> diff --git a/app/views/uploads/show.html.erb b/app/views/uploads/show.html.erb index 53bde1996..7ba4dee40 100644 --- a/app/views/uploads/show.html.erb +++ b/app/views/uploads/show.html.erb @@ -6,6 +6,10 @@

Error: <%= @upload.error %>.

<% elsif @upload.media_asset_count == 0 %>

Processing upload...

+ + <% content_for(:html_header) do %> + + <% end %> <% elsif @upload.media_asset_count > 1 %>
<%= render "multiple_asset_upload", upload: @upload %>