extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 23:00:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

"fix for bug #768: title is not changed whenever the project is changed

Browse Source 
fix for bug #865: timesheets link to all projects that were booked before (save&new)"
This commit is contained in:
Ralf Becker 2007-06-07 09:13:55 +00:00
parent fb17148787
commit cfd945e3ce
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
timesheet/inc/class.uitimesheet.inc.php
View File

@ -196,6 +196,8 @@ class uitimesheet extends botimesheet
{ {
unset($this->data[$name]); unset($this->data[$name]);
} }
// save the selected project, to delete the project-link, if the user changes the project
$this->data['old_pm_id'] = $this->data['pm_id'];
break; break;
} }
// fall-through for save // fall-through for save
@ -256,6 +258,7 @@ class uitimesheet extends botimesheet
$links[] = $link_id; $links[] = $link_id;
break; break;
case 'infolog': case 'infolog':
// a preserved title blur is only set for other (non-project) links, it stays with Save&New!
$preserv['ts_title_blur'] = $this->link->title('infolog',$link_id); $preserv['ts_title_blur'] = $this->link->title('infolog',$link_id);
break; break;
} }
@ -286,7 +289,9 @@ class uitimesheet extends botimesheet
{ {
$preserv['ts_project'] = $preserv['ts_project_blur']; $preserv['ts_project'] = $preserv['ts_project_blur'];
} }
$content['ts_title_blur'] = $preserv['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'];
$readonlys = array( $readonlys = array(
'button[delete]' => !$this->data['ts_id'] || !$this->check_acl(EGW_ACL_DELETE), 'button[delete]' => !$this->data['ts_id'] || !$this->check_acl(EGW_ACL_DELETE),