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

"fixed not displayed time sum, if \"time, planned\" column was selected:

Browse Source 
-> only check used&planned time (not replanned) to work for both time cols"
This commit is contained in:
Ralf Becker 2009-08-25 13:20:02 +00:00
parent 515c1cbefc
commit d8c99b809e
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -187,7 +187,6 @@ class infolog_ui
$readonlys["timesheet[$id]"] = !isset($GLOBALS['egw_info']['user']['apps']['timesheet']); $readonlys["timesheet[$id]"] = !isset($GLOBALS['egw_info']['user']['apps']['timesheet']);
if (!$show_links) $show_links = $this->prefs['show_links']; if (!$show_links) $show_links = $this->prefs['show_links'];
if (($show_links != 'none' && $show_links != 'no_describtion' || if (($show_links != 'none' && $show_links != 'no_describtion' ||
$this->prefs['show_times'] || isset($GLOBALS['egw_info']['user']['apps']['timesheet'])) && $this->prefs['show_times'] || isset($GLOBALS['egw_info']['user']['apps']['timesheet'])) &&
(isset($info['links']) || ($info['links'] = egw_link::get_links('infolog',$info['info_id'])))) (isset($info['links']) || ($info['links'] = egw_link::get_links('infolog',$info['info_id']))))
@ -353,8 +352,8 @@ class infolog_ui
$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_replanned_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 (we only check used&planned to work for both time cols)
$this->prefs['show_times'] = strpos($this->prefs['nextmatch-'.$query['columnselection_pref']],'info_used_time_info_planned_time_info_replanned_time') !== false; $this->prefs['show_times'] = strpos($this->prefs['nextmatch-'.$query['columnselection_pref']],'info_used_time_info_planned_time') !== false;
// query all links and sub counts in one go // query all links and sub counts in one go
if ($infos && !$query['csv_export']) if ($infos && !$query['csv_export'])