extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-10-05 01:32:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Infolog: Fix details filter

Browse Source 
Timing changed so value was being put back
This commit is contained in:
nathan 2023-12-07 09:52:07 -07:00
parent 2f0a38e4f1
commit e26bcee006
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
infolog/js/app.ts
View File

@ -262,11 +262,11 @@ class InfologApp extends EgwApp
* either 'all' for details or 'no_description' for no details * either 'all' for details or 'no_description' for no details
* *
* @param {Event} event Change event * @param {Event} event Change event
* @param {et2_nextmatch} nm The nextmatch widget that owns the filter * @param {Et2Select} filter2 The filter widget
*/ */
filter2_change(event, nm) filter2_change(event, filter2)
{ {
var filter2 = nm.getWidgetById('filter2'); let nm = filter2.getParent().getParent();
if (nm && filter2) if (nm && filter2)
{ {
@ -278,6 +278,12 @@ class InfologApp extends EgwApp
// favorites // favorites
if (nm && filter2 && !nm.update_in_progress) if (nm && filter2 && !nm.update_in_progress)
{ {
// Update page - set update_in_progress to true to avoid triggering
// the change handler and looping if the user has a custom field
// column change
let in_progress = nm.update_in_progress;
nm.update_in_progress = true;
// Store selection as implicit preference // Store selection as implicit preference
egw.set_preference('infolog', nm.options.settings.columnselection_pref.replace('-details','')+'-details-pref', filter2.get_value()); egw.set_preference('infolog', nm.options.settings.columnselection_pref.replace('-details','')+'-details-pref', filter2.get_value());
@ -302,16 +308,14 @@ class InfologApp extends EgwApp
} }
nm.dataview.getColumnMgr().updated(); nm.dataview.getColumnMgr().updated();
// Update page - set update_in_progress to true to avoid triggering
// the change handler and looping if the user has a custom field
// column change
var in_progress = nm.update_in_progress;
nm.update_in_progress = true;
// Set the actual filter value here // Set the actual filter value here
nm.activeFilters.filter2 = filter2.get_value(); nm.activeFilters.filter2 = filter2.get_value();
nm.dataview.updateColumns(); nm.dataview.updateColumns();
nm.update_in_progress = in_progress; nm.update_in_progress = in_progress;
} }
// Already handled everything here and the column change probably triggered a reload
// Return false to skip nm doing the filter value change
return false; return false;
} }