composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

N°4203 - Activity panel: Hide "load more entries" button when only "logs" filter is active

Browse Source
This commit is contained in:
Molkobain
2021-07-28 10:07:03 +02:00
parent d38b655f5f
commit 7598c18ad6
2 changed files with 32 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1143,6 +1143,7 @@ $(function()
});
this._UpdateEntryGroupsVisibility();
this._UpdateLoadMoreEntriesButtonVisibility();
this._UpdateMessagesCounters();
},
_ShowAllEntries: function()
@@ -1200,6 +1201,12 @@ $(function()
this._UpdateEntryGroupsVisibility();
},
/**
* Update the entry groups visibility regarding if they have visible entries themself
*
* @private
* @return {void}
*/
_UpdateEntryGroupsVisibility: function () {
const me = this;
@@ -1211,6 +1218,27 @@ $(function()
}
});
},
/**
* Update the "load more entries" button visibility regarding the current filters
*
* @private
* @return {void}
*/
_UpdateLoadMoreEntriesButtonVisibility: function () {
const oButtonElem = this.element.find(this.js_selectors.load_more_entries);
// Check if button exists (if all entries have been loaded, we might have remove it
if (oButtonElem.length === 0) {
return;
}
// Show button only if the states / edits filters are selected as log entries are always fully loaded
if (this._GetActiveTabToolbarElement().find(this.js_selectors.activity_filter + '[data-target-entry-types!="'+this.enums.entry_types.caselog+'"]:checked').length > 0) {
oButtonElem.removeClass(this.css_classes.is_hidden);
} else {
oButtonElem.addClass(this.css_classes.is_hidden);
}
},
/**
* Load the next entries and append them to the current ones
*
@@ -1266,7 +1294,7 @@ $(function()
me.options.last_loaded_entries_ids = oData.data.last_loaded_entries_ids;
// - Update button state
if (Object.keys(me.options.last_loaded_entries_ids).length === 0) {
me.element.find(me.js_selectors.load_more_entries).addClass(me.css_classes.is_hidden);
me.element.find(me.js_selectors.load_more_entries).remove();
}
})
.always(function () {

4
templates/base/layouts/activity-panel/layout.html.twig
View File

@@ -83,7 +83,9 @@
{% endfor %}
{% if oUIBlock.HasMoreEntriesToLoad() %}
<div class="ibo-activity-panel--load-more-entries-container" data-role="ibo-activity-panel--load-more-entries-container">
<a href="#" class="ibo-activity-panel--load-more-entries" data-role="ibo-activity-panel--load-more-entries" data-tooltip-content="{{ 'UI:Layout:ActivityPanel:LoadMoreEntries:Tooltip'|dict_s }}">
{# Note: The "more entries" button is hidden by default to avoid a visual glitch. #}
{# Otherwise when the page is loaded, the button is displayed even if the current tab only show log entries (which are all loaded) #}
<a href="#" class="ibo-activity-panel--load-more-entries ibo-is-hidden" data-role="ibo-activity-panel--load-more-entries" data-tooltip-content="{{ 'UI:Layout:ActivityPanel:LoadMoreEntries:Tooltip'|dict_s }}">
<span class="ibo-activity-panel--load-more-entries-icon fas fa-fw fa-angle-double-down" data-role="ibo-activity-panel--load-more-entries-icon"></span>
</a>
</div>