From 92da2abb2e08783c69618efa22a70d75ca01292d Mon Sep 17 00:00:00 2001 From: Stefan Becker Date: Sat, 14 Nov 2009 18:02:21 +0000 Subject: [PATCH] "fixed bug with predefined status" --- timesheet/inc/class.timesheet_ui.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/timesheet/inc/class.timesheet_ui.inc.php b/timesheet/inc/class.timesheet_ui.inc.php index 7945213440..2cea98d491 100644 --- a/timesheet/inc/class.timesheet_ui.inc.php +++ b/timesheet/inc/class.timesheet_ui.inc.php @@ -110,7 +110,7 @@ class timesheet_ui extends timesheet_bo if ($this->ts_viewtype == 'short') { $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!) 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) : '', 'start_time' => egw_time::to($this->data['ts_start'],'H:i'), '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(); // create links specified in the REQUEST (URL)