From c53482838e0f00a7055f3ddfad3a9e8c7d968ff9 Mon Sep 17 00:00:00 2001 From: Go MAEDA Date: Thu, 18 Mar 2021 14:39:31 +0000 Subject: [PATCH] Merged r20822 from trunk to 4.1-stable (#33338). git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@20823 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- public/javascripts/application.js | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/public/javascripts/application.js b/public/javascripts/application.js index f1262d5e0..c1b1c7c71 100644 --- a/public/javascripts/application.js +++ b/public/javascripts/application.js @@ -371,15 +371,29 @@ function showIssueHistory(journal, url) { switch(journal) { case 'notes': + tab_content.find('.journal').show(); tab_content.find('.journal:not(.has-notes)').hide(); - tab_content.find('.journal.has-notes').show(); + tab_content.find('.journal .wiki').show(); + tab_content.find('.journal .contextual .journal-actions').show(); + + // always show thumbnails in notes tab + var thumbnails = tab_content.find('.journal .thumbnails'); + thumbnails.show(); + // show journals without notes, but with thumbnails + thumbnails.parents('.journal').show(); break; case 'properties': - tab_content.find('.journal.has-notes').hide(); - tab_content.find('.journal:not(.has-notes)').show(); + tab_content.find('.journal').show(); + tab_content.find('.journal:not(.has-details)').hide(); + tab_content.find('.journal .wiki').hide(); + tab_content.find('.journal .thumbnails').hide(); + tab_content.find('.journal .contextual .journal-actions').hide(); break; default: tab_content.find('.journal').show(); + tab_content.find('.journal .wiki').show(); + tab_content.find('.journal .thumbnails').show(); + tab_content.find('.journal .contextual .journal-actions').show(); } return false; -- 2.39.5