holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix details filter not properly changing

Browse Source
This commit is contained in:
Nathan Gray 2014-06-04 18:43:21 +00:00
parent 2e09cf1ab1
commit a866eb5ed9
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
infolog/inc/class.infolog_ui.inc.php
View File

@ -394,16 +394,16 @@ class infolog_ui
// add a '-details' to the name of the columnselection pref
if ($details)
{
$query['columnselection-pref'] = 'nextmatch-'.(is_object($query['template'])?$query['template']->name:'infolog.index.rows').'-details';
$query['columnselection_pref'] = 'nextmatch-'.(is_object($query['template'])?$query['template']->name:'infolog.index.rows').'-details';
$query['default_cols'] = '!cat_id,info_used_time_info_planned_time,info_used_time_info_planned_time_info_replanned_time,info_id,actions';
}
else
{
$query['columnselection-pref'] = 'nextmatch-infolog.index.rows';
$query['columnselection_pref'] = 'nextmatch-infolog.index.rows';
$query['default_cols'] = '!cat_id,info_datemodified,info_used_time_info_planned_time,info_used_time_info_planned_time_info_replanned_time,info_id,actions';
}
// set old show_times pref, that get_info calculates the cumulated time of the timesheets (we only check used&planned to work for both time cols)
$this->prefs['show_times'] = strpos($this->prefs[$query['columnselection-pref']],'info_used_time_info_planned_time') !== false;
$this->prefs['show_times'] = strpos($this->prefs[$query['columnselection_pref']],'info_used_time_info_planned_time') !== false;
// query all links and sub counts in one go
if ($infos && (!$query['csv_export'] || !is_array($query['csv_export'])))

2
infolog/js/app.js
View File

@ -141,7 +141,7 @@ app.classes.infolog = AppJS.extend(
// Load new preferences
var colData = [];
for(var i = 0; i < nm.columns.length; i++) colData[i] = {disabled: true, width: '0'};
for(var i = 0; i < nm.columns.length; i++) colData[i] = {disabled: true, width: '20'};
nm._applyUserPreferences(nm.columns, colData);
for(var i = 0; i < colData.length; i++)
{