extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-03 04:29:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix to control the existence of content start_time/end_time before trying to construct a dateobject

Browse Source
This commit is contained in:
Klaus Leithoff 2009-12-14 16:25:12 +00:00
parent 086edcac9b
commit 2bd5449c40
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -112,7 +112,7 @@ class timesheet_ui extends timesheet_bo
$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 (isset($content['start_time']) && $content['start_time'] != '00:00') // start-time specified
{ {
//$content['ts_start'] += $content['start_time']; //$content['ts_start'] += $content['start_time'];
$start = new egw_time($content['ts_start']); $start = new egw_time($content['ts_start']);
@ -120,7 +120,7 @@ class timesheet_ui extends timesheet_bo
$start->setTime($start_time[0],$start_time[1]); $start->setTime($start_time[0],$start_time[1]);
$content['ts_start'] = $start->format('ts'); $content['ts_start'] = $start->format('ts');
} }
if ($content['end_time'] != '00:00') // end-time specified if (isset($content['end_time']) && $content['end_time'] != '00:00') // end-time specified
{ {
$end = new egw_time($content['ts_start']); $end = new egw_time($content['ts_start']);
$end_time = explode(':',$content['end_time']); $end_time = explode(':',$content['end_time']);
@ -384,7 +384,7 @@ class timesheet_ui extends timesheet_bo
} }
if (!$this->customfields) $readonlys['tabs']['customfields'] = true; // suppress tab if there are not customfields if (!$this->customfields) $readonlys['tabs']['customfields'] = true; // suppress tab if there are not customfields
if (!$this->data['ts_id']) $readonlys['tabs']['history'] = true; //suppress history for the first loading without ID if (!$this->data['ts_id']) $readonlys['tabs']['history'] = true; //suppress history for the first loading without ID
return $etpl->exec(TIMESHEET_APP.'.timesheet_ui.edit',$content,$sel_options,$readonlys,$preserv,2); return $etpl->exec(TIMESHEET_APP.'.timesheet_ui.edit',$content,$sel_options,$readonlys,$preserv,2);
} }