From 28c5aa2c198b57edab1be801106afb8f6b424c65 Mon Sep 17 00:00:00 2001 From: Klaus Leithoff Date: Mon, 10 Jun 2013 12:22:09 +0000 Subject: [PATCH] * Timesheet: fix for missing preset title --- timesheet/inc/class.timesheet_ui.inc.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/timesheet/inc/class.timesheet_ui.inc.php b/timesheet/inc/class.timesheet_ui.inc.php index df1cacad54..ebb555e0c6 100644 --- a/timesheet/inc/class.timesheet_ui.inc.php +++ b/timesheet/inc/class.timesheet_ui.inc.php @@ -396,10 +396,16 @@ class timesheet_ui extends timesheet_bo ), ); $sel_options['status'] = $this->field2label; + if (empty($content['ts_title'])) + { + $content['ts_title'] = $content['ts_title_blur'] = ($preserv['ts_title_blur'] ? $preserv['ts_title_blur'] : $preserv['ts_project_blur']); + } // the actual title-blur is either the preserved title blur (if we are called from infolog entry), // or the preserved project-blur comming from the current selected project $content['ts_title_blur'] = $preserv['ts_title_blur'] ? $preserv['ts_title_blur'] : $preserv['ts_project_blur']; + // make sure that ts_title is shown (if set), by unsetting the blur text + if (!empty($content['ts_title']) && $content['ts_title']==$content['ts_title_blur']) unset($content['ts_title_blur']); $readonlys = array( 'button[delete]' => !$this->data['ts_id'] || !$this->check_acl(EGW_ACL_DELETE) || $this->data['ts_status'] == self::DELETED_STATUS, 'button[undelete]' => $this->data['ts_status'] != self::DELETED_STATUS,