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

"fixed bug with predefined status"

Browse Source
This commit is contained in:
Stefan Becker 2009-11-14 18:02:21 +00:00
parent 66c4b6c0cb
commit 92da2abb2e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
timesheet/inc/class.timesheet_ui.inc.php
View File

@ -110,7 +110,7 @@ class timesheet_ui extends timesheet_bo
if ($this->ts_viewtype == 'short') if ($this->ts_viewtype == 'short')
{ {
$content['start_time']=$content['end_time']='00:00'; $content['start_time']=$content['end_time']='00:00';
} }
// we only need 2 out of 3 values from start-, end-time or duration (the date in ts_start is always required!) // we only need 2 out of 3 values from start-, end-time or duration (the date in ts_start is always required!)
if ($content['start_time'] != '00:00') // start-time specified if ($content['start_time'] != '00:00') // start-time specified
{ {
@ -279,7 +279,7 @@ class timesheet_ui extends timesheet_bo
'ts_quantity_blur' => $this->data['ts_duration'] ? round($this->data['ts_duration'] / 60.0,3) : '', 'ts_quantity_blur' => $this->data['ts_duration'] ? round($this->data['ts_duration'] / 60.0,3) : '',
'start_time' => egw_time::to($this->data['ts_start'],'H:i'), 'start_time' => egw_time::to($this->data['ts_start'],'H:i'),
'pm_integration' => $this->pm_integration, 'pm_integration' => $this->pm_integration,
'ts_status' => ($preserv['ts_status'] !='')? $preserv['ts_status'] : $GLOBALS['egw_info']['user']['preferences']['timesheet']['predefined_status'], 'ts_status' => ($preserv['ts_id'])? $preserv['ts_status'] : $GLOBALS['egw_info']['user']['preferences']['timesheet']['predefined_status'],
)); ));
$links = array(); $links = array();
// create links specified in the REQUEST (URL) // create links specified in the REQUEST (URL)