From: Go MAEDA <maeda@farend.jp>
Date: Thu, 18 Mar 2021 14:36:58 +0000 (+0000)
Subject: Property changes tab does not show journals with both property changes and notes... 
X-Git-Tag: 4.2.0~32
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=77e199e817d841c65bab8405056ad4b71c19062e;p=redmine.git

Property changes tab does not show journals with both property changes and notes (#33338).

Patch by Mischa The Evil and Marius BALTEANU.


git-svn-id: http://svn.redmine.org/redmine/trunk@20822 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index bef8f592f..aa0c9ed0b 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -364,15 +364,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;