composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-02 23:18:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°2844 - Activity panel: Fix user medallion not displayed when filtering entries

Browse Source
This commit is contained in:
Molkobain
2020-12-17 15:33:57 +01:00
parent d664c26fb7
commit efe61c7b14
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
js/layouts/activity-panel/activity-panel.js
View File

@@ -33,6 +33,7 @@ $(function()
is_opened: 'ibo-is-opened',
is_closed: 'ibo-is-closed',
is_active: 'ibo-is-active',
is_visible: 'ibo-is-visible',
is_hidden: 'ibo-is-hidden',
},
js_selectors:
@@ -46,6 +47,7 @@ $(function()
caselog_tab_close_all: '[data-role="ibo-activity-panel--caselog-close-all"]',
entry_group: '[data-role="ibo-activity-panel--entry-group"]',
entry: '[data-role="ibo-activity-entry"]',
entry_medallion: '[data-role="ibo-activity-entry--medallion"]',
entry_main_information: '[data-role="ibo-activity-entry--main-information"]',
entry_datetime: '[data-role="ibo-activity-entry--datetime"]',
edits_entry_long_description: '[data-role="ibo-edits-entry--long-description"]',
@@ -249,6 +251,7 @@ $(function()
{
const me = this;
// For each filter, show/hide corresponding entries
this.element.find(this.js_selectors.activity_tab_filter).each(function(){
const aTargetEntryTypes = $(this).attr('data-target-entry-types').split(' ');
const sCallbackMethod = ($(this).prop('checked')) ? '_ShowEntries' : '_HideEntries';
@@ -258,6 +261,12 @@ $(function()
me[sCallbackMethod](aTargetEntryTypes[iIdx]);
}
});
// Show only the last visible entry's medallion of a group (can be done through CSS yet 😕)
this.element.find(this.js_selectors.entry_group).each(function(){
$(this).find(me.js_selectors.entry_medallion).removeClass(me.css_classes.is_visible);
$(this).find(me.js_selectors.entry + ':visible:last').find(me.js_selectors.entry_medallion).addClass(me.css_classes.is_visible);
});
},
_ShowAllEntries: function()
{