From 1ce490ebccb03c163d0009607f22eead8d5ca4db Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Wed, 10 Sep 2014 11:14:18 +0000 Subject: [PATCH] * Timesheet: fix lost comment when viewtype was set to simple r48574: Fix doubled description ID (ts_description), caused lost comment when viewtype was set to simple --- timesheet/inc/class.timesheet_ui.inc.php | 2 ++ timesheet/templates/default/edit.xet | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/timesheet/inc/class.timesheet_ui.inc.php b/timesheet/inc/class.timesheet_ui.inc.php index 0ea90da19c..5117c7a4b6 100644 --- a/timesheet/inc/class.timesheet_ui.inc.php +++ b/timesheet/inc/class.timesheet_ui.inc.php @@ -107,6 +107,7 @@ class timesheet_ui extends timesheet_bo if ($this->ts_viewtype == 'short') { $content['start_time']=$content['end_time']=null; + $content['ts_description'] = $content['ts_description_short']; } // we only need 2 out of 3 values from start-, end-time or duration (the date in ts_start is always required!) if (isset($content['start_time'])) // start-time specified @@ -438,6 +439,7 @@ class timesheet_ui extends timesheet_bo if($this->ts_viewtype == 'short') { $content['ts_viewtype'] = $readonlys['tabs']['notes'] = true; + $content['ts_description_short'] = $content['ts_description']; } 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 diff --git a/timesheet/templates/default/edit.xet b/timesheet/templates/default/edit.xet index 8906de3de3..73e54fbb20 100644 --- a/timesheet/templates/default/edit.xet +++ b/timesheet/templates/default/edit.xet @@ -35,7 +35,7 @@ - +