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

fixed different column-selection for "Details" and "No details" and therefore not calculated timesheet sum

Browse Source
This commit is contained in:
Ralf Becker 2014-05-22 16:38:22 +00:00
parent 1f4c8a0c03
commit 50baa1af34
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

@ -366,7 +366,7 @@ class infolog_ui
//_debug_array($columselection);
if ($columselection)
{
$columselection = is_array($columnselection) ? $columnselection : explode(',',$columselection);
$columselection = is_array($columselection) ? $columselection : explode(',',$columselection);
}
else
{
@ -384,16 +384,16 @@ class infolog_ui
// add a '-details' to the name of the columnselection pref
if ($details)
{
$columnselection_pref = (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
{
$columnselection_pref = '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['nextmatch-'.$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'])))