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

Fix not correctly set of $this->prefs['show_times'] pref (because of addition of info_replanned_time columnt to the header)

Browse Source
This commit is contained in:
José Luis Gordo Romero 2008-10-08 09:40:23 +00:00
parent cf83c28592
commit bad25ee249
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -345,15 +345,15 @@ class infolog_ui
if ($details) if ($details)
{ {
$query['columnselection_pref'] = (is_object($query['template'])?$query['template']->name:'infolog.index.rows').'-details'; $query['columnselection_pref'] = (is_object($query['template'])?$query['template']->name:'infolog.index.rows').'-details';
$query['default_cols'] = '!cat_id,info_used_time_info_planned_time,info_id'; $query['default_cols'] = '!cat_id,info_used_time_info_planned_time_info_replanned_time,info_id';
} }
else else
{ {
$query['columnselection_pref'] = 'infolog.index.rows'; $query['columnselection_pref'] = 'infolog.index.rows';
$query['default_cols'] = '!cat_id,info_datemodified,info_used_time_info_planned_time,info_id'; $query['default_cols'] = '!cat_id,info_datemodified,info_used_time_info_planned_time_info_replanned_time,info_id';
} }
// set old show_times pref, that get_info calculates the cumulated time of the timesheets // set old show_times pref, that get_info calculates the cumulated time of the timesheets
$this->prefs['show_times'] = strpos($this->prefs['nextmatch-'.$query['columnselection_pref']],'info_used_time_info_planned_time') !== false; $this->prefs['show_times'] = strpos($this->prefs['nextmatch-'.$query['columnselection_pref']],'info_used_time_info_planned_time_info_replanned_time') !== false;
// query all links in one go // query all links in one go
if ($infos && !$query['csv_export']) if ($infos && !$query['csv_export'])
@ -595,7 +595,7 @@ class infolog_ui
if ($action == 'sp') if ($action == 'sp')
{ {
$pref = 'nextmatch-infolog.index.rows'.($values['nm']['filter2']=='all'?'-details':''); $pref = 'nextmatch-infolog.index.rows'.($values['nm']['filter2']=='all'?'-details':'');
foreach(array('info_used_time_info_planned_time','info_datemodified','info_owner_info_responsible','customfields') as $name) foreach(array('info_used_time_info_planned_time_info_replanned_time','info_datemodified','info_owner_info_responsible','customfields') as $name)
{ {
$values['main']['no_'.$name] = strpos($this->prefs[$pref],$name) === false; $values['main']['no_'.$name] = strpos($this->prefs[$pref],$name) === false;
} }