From e0ed6391f53f3b635e156448018afe4a1cfc0e40 Mon Sep 17 00:00:00 2001 From: evazion Date: Tue, 15 Feb 2022 00:53:36 -0600 Subject: [PATCH] uploads: fix related tags error on multi-file upload page. Fix the related tags Javascript trying to run on the multi-file upload page. It should only run on the single-file upload page. --- app/javascript/src/javascripts/related_tag.js | 2 +- app/javascript/src/javascripts/uploads.js | 2 +- app/views/upload_media_assets/show.html.erb | 4 +++- app/views/uploads/show.html.erb | 8 ++++++-- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/app/javascript/src/javascripts/related_tag.js b/app/javascript/src/javascripts/related_tag.js index 912b1c40c..5386909e9 100644 --- a/app/javascript/src/javascripts/related_tag.js +++ b/app/javascript/src/javascripts/related_tag.js @@ -21,7 +21,7 @@ RelatedTag.initialize_all = function() { // Show the related tags automatically when the "Edit" tab is opened, or by default on the uploads page. $(document).on("danbooru:open-post-edit-tab", RelatedTag.show); - if ($("#c-uploads #a-show").length) { + if ($("#c-uploads #a-show #p-single-asset-upload").length) { RelatedTag.show(); } } diff --git a/app/javascript/src/javascripts/uploads.js b/app/javascript/src/javascripts/uploads.js index c3d39d340..e3d037cea 100644 --- a/app/javascript/src/javascripts/uploads.js +++ b/app/javascript/src/javascripts/uploads.js @@ -7,7 +7,7 @@ Upload.IQDB_MIN_SIMILARITY = 50; Upload.IQDB_HIGH_SIMILARITY = 70; Upload.initialize_all = function() { - if ($("#c-uploads #a-show").length) { + if ($("#c-uploads #a-show #p-single-asset-upload").length) { this.initialize_similar(); $("#toggle-artist-commentary").on("click.danbooru", function(e) { diff --git a/app/views/upload_media_assets/show.html.erb b/app/views/upload_media_assets/show.html.erb index b2f75790a..810db0f48 100644 --- a/app/views/upload_media_assets/show.html.erb +++ b/app/views/upload_media_assets/show.html.erb @@ -2,7 +2,9 @@

Upload

- <%= render "uploads/single_asset_upload", upload_media_asset: @upload_media_asset %> +
+ <%= render "uploads/single_asset_upload", upload_media_asset: @upload_media_asset %> +
diff --git a/app/views/uploads/show.html.erb b/app/views/uploads/show.html.erb index 84bc33ae3..53bde1996 100644 --- a/app/views/uploads/show.html.erb +++ b/app/views/uploads/show.html.erb @@ -7,9 +7,13 @@ <% elsif @upload.media_asset_count == 0 %>

Processing upload...

<% elsif @upload.media_asset_count > 1 %> - <%= render "multiple_asset_upload", upload: @upload %> +
+ <%= render "multiple_asset_upload", upload: @upload %> +
<% elsif @upload.media_asset_count == 1 %> - <%= render "single_asset_upload", upload_media_asset: @upload.upload_media_assets.first %> +
+ <%= render "single_asset_upload", upload_media_asset: @upload.upload_media_assets.first %> +
<% end %>