extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-22 07:53:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix interference between CRM details / no details and infolog details / no details

Browse Source 
Changing CRM to details would clear no details CSS from infolog
This commit is contained in:
nathangray 2016-07-28 16:10:02 -06:00
parent a019185ec2
commit 9cf5ab29a1
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
infolog/js/app.js
View File

@ -60,7 +60,7 @@ app.classes.infolog = AppJS.extend(
var filter2 = nm.getWidgetById('filter2'); var filter2 = nm.getWidgetById('filter2');
this.show_details(filter2.value == 'all',nm.getDOMNode(nm)); this.show_details(filter2.value == 'all',nm.getDOMNode(nm));
// Remove the rule added by show_details() if the template is removed // 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 // Enable decrypt on hover
if(this.egw.user('apps').stylite) if(this.egw.user('apps').stylite)
@ -258,7 +258,10 @@ app.classes.infolog = AppJS.extend(
var colData = nm.columns.slice(); var colData = nm.columns.slice();
for(var i = 0; i < nm.columns.length; i++) colData[i].visible=false; 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); nm._applyUserPreferences(nm.columns, colData);
// Now apply them to columns // Now apply them to columns