From 9cf5ab29a1bd4e8a2c8c2a64626001776bb57438 Mon Sep 17 00:00:00 2001 From: nathangray Date: Thu, 28 Jul 2016 16:10:02 -0600 Subject: [PATCH] Fix interference between CRM details / no details and infolog details / no details Changing CRM to details would clear no details CSS from infolog --- infolog/js/app.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/infolog/js/app.js b/infolog/js/app.js index 1059c00e90..4ccc89b0ba 100644 --- a/infolog/js/app.js +++ b/infolog/js/app.js @@ -60,7 +60,7 @@ app.classes.infolog = AppJS.extend( var filter2 = nm.getWidgetById('filter2'); this.show_details(filter2.value == 'all',nm.getDOMNode(nm)); // Remove the rule added by show_details() if the template is removed - jQuery(_et2.DOMContainer).on('clear', function() {egw.css('#infolog-index_nm .et2_box.infoDes');}); + jQuery(_et2.DOMContainer).on('clear', jQuery.proxy(function() {egw.css(this);}, '#' + nm.getDOMNode(nm).id + ' .et2_box.infoDes')); // Enable decrypt on hover if(this.egw.user('apps').stylite) @@ -258,7 +258,10 @@ app.classes.infolog = AppJS.extend( var colData = nm.columns.slice(); for(var i = 0; i < nm.columns.length; i++) colData[i].visible=false; - nm.set_columns(egw.preference(nm.options.settings.columnselection_pref,'infolog').split(',')); + if(egw.preference(nm.options.settings.columnselection_pref,'infolog')) + { + nm.set_columns(egw.preference(nm.options.settings.columnselection_pref,'infolog').split(',')); + } nm._applyUserPreferences(nm.columns, colData); // Now apply them to columns