From 20af564f37201f5ca07eb20418a6b75727be81c0 Mon Sep 17 00:00:00 2001 From: nathangray Date: Mon, 22 Mar 2021 09:50:02 -0600 Subject: [PATCH] * Infolog: Fix details / no details filter preference was not saved --- infolog/js/app.js | 6 +++--- infolog/js/app.ts | 11 ++++++----- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/infolog/js/app.js b/infolog/js/app.js index 2bf6a16da9..7798c08899 100644 --- a/infolog/js/app.js +++ b/infolog/js/app.js @@ -83,7 +83,7 @@ var InfologApp = /** @class */ (function (_super) { // Show / hide descriptions according to details filter var nm = this.et2.getWidgetById('nm'); var filter2 = nm.getWidgetById('filter2'); - this.show_details(filter2.value == 'all', nm.getDOMNode(nm)); + this.show_details(filter2.get_value() == 'all', nm.getDOMNode(nm)); // Remove the rule added by show_details() if the template is removed jQuery(_et2.DOMContainer).on('clear', jQuery.proxy(function () { egw.css(this); }, '#' + nm.getDOMNode(nm).id + ' .et2_box.infoDes')); // Enable decrypt on hover @@ -246,9 +246,9 @@ var InfologApp = /** @class */ (function (_super) { // favorites if (nm && filter2 && !nm.update_in_progress) { // Store selection as implicit preference - egw.set_preference('infolog', nm.options.settings.columnselection_pref.replace('-details', '') + '-details-pref', filter2.value); + egw.set_preference('infolog', nm.options.settings.columnselection_pref.replace('-details', '') + '-details-pref', filter2.get_value()); // Change preference location - widget is nextmatch - nm.options.settings.columnselection_pref = nm.options.settings.columnselection_pref.replace('-details', '') + (filter2.value == 'all' ? '-details' : ''); + nm.options.settings.columnselection_pref = nm.options.settings.columnselection_pref.replace('-details', '') + (filter2.get_value() == 'all' ? '-details' : ''); // Load new preferences var colData = nm.columns.slice(); for (var i = 0; i < nm.columns.length; i++) diff --git a/infolog/js/app.ts b/infolog/js/app.ts index c1a2f071ad..86ffeded05 100644 --- a/infolog/js/app.ts +++ b/infolog/js/app.ts @@ -22,6 +22,7 @@ import {et2_dialog} from "../../api/js/etemplate/et2_widget_dialog"; import {etemplate2} from "../../api/js/etemplate/etemplate2"; import {et2_nextmatch} from "../../api/js/etemplate/et2_extension_nextmatch"; import {CRMView} from "../../addressbook/js/CRM"; +import {et2_selectbox} from "../../api/js/etemplate/et2_widget_selectbox"; /** * UI for Infolog @@ -79,9 +80,9 @@ class InfologApp extends EgwApp case 'infolog.index': this.filter_change(); // Show / hide descriptions according to details filter - var nm = this.et2.getWidgetById('nm'); - var filter2 = nm.getWidgetById('filter2'); - this.show_details(filter2.value == 'all',nm.getDOMNode(nm)); + var nm = this.et2.getWidgetById('nm'); + var filter2 = nm.getWidgetById('filter2'); + this.show_details(filter2.get_value() == 'all',nm.getDOMNode(nm)); // Remove the rule added by show_details() if the template is removed jQuery(_et2.DOMContainer).on('clear', jQuery.proxy(function() {egw.css(this);}, '#' + nm.getDOMNode(nm).id + ' .et2_box.infoDes')); @@ -274,10 +275,10 @@ class InfologApp extends EgwApp if (nm && filter2 && !nm.update_in_progress) { // Store selection as implicit preference - egw.set_preference('infolog', nm.options.settings.columnselection_pref.replace('-details','')+'-details-pref', filter2.value); + egw.set_preference('infolog', nm.options.settings.columnselection_pref.replace('-details','')+'-details-pref', filter2.get_value()); // Change preference location - widget is nextmatch - nm.options.settings.columnselection_pref = nm.options.settings.columnselection_pref.replace('-details','') + (filter2.value == 'all' ? '-details' :''); + nm.options.settings.columnselection_pref = nm.options.settings.columnselection_pref.replace('-details','') + (filter2.get_value() == 'all' ? '-details' :''); // Load new preferences var colData = nm.columns.slice();