From 2348c8e1acef85f05a463fd28034470c78f8691f Mon Sep 17 00:00:00 2001 From: Klaus Leithoff Date: Mon, 10 Jun 2013 13:12:34 +0000 Subject: [PATCH] * Timesheet: fix for missing preset title --- timesheet/inc/class.timesheet_ui.inc.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/timesheet/inc/class.timesheet_ui.inc.php b/timesheet/inc/class.timesheet_ui.inc.php index 692a1978f3..3c13bfb1de 100644 --- a/timesheet/inc/class.timesheet_ui.inc.php +++ b/timesheet/inc/class.timesheet_ui.inc.php @@ -332,8 +332,9 @@ class timesheet_ui extends timesheet_bo $links[] = $link_id; break; case 'infolog': + case 'tracker': // a preserved title blur is only set for other (non-project) links, it stays with Save&New! - $preserv['ts_title_blur'] = egw_link::title('infolog',$link_id); + $preserv['ts_title_blur'] = egw_link::title($link_app,$link_id); break; } } @@ -376,9 +377,16 @@ class timesheet_ui extends timesheet_bo { $sel_options['status'][$status] = $this->field2label[$field]; } + 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), 'button[edit]' => !$view || !$this->check_acl(EGW_ACL_EDIT),