* Timesheet: fix for missing preset title

This commit is contained in:
Klaus Leithoff 2013-06-10 13:12:34 +00:00
parent ebcda59e45
commit 2348c8e1ac

View File

@ -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),