Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-16 10:16:03 +01:00
Code Issues Packages Projects Releases Activity

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

Browse Source 
Patch by Mischa The Evil and Marius BALTEANU.


git-svn-id: http://svn.redmine.org/redmine/trunk@20822 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA
2021-03-18 14:36:58 +00:00
parent 0d96c4ebdb
commit 77e199e817
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
public/javascripts/application.js
View File

@@ -364,15 +364,29 @@ function showIssueHistory(journal, url) {
switch(journal) { switch(journal) {
case 'notes': case 'notes':
tab_content.find('.journal').show();
tab_content.find('.journal:not(.has-notes)').hide(); 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; break;
case 'properties': case 'properties':
tab_content.find('.journal.has-notes').hide(); tab_content.find('.journal').show();
tab_content.find('.journal:not(.has-notes)').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; break;
default: default:
tab_content.find('.journal').show(); 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; return false;