extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-07 16:44:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

"fix for bug #839: main window: projectname not linked to project when adding first booking

Browse Source 
--> partially reverting patch from Knut, as it only breaks stuff
also disabling the custom-fields tab, if there are none"
This commit is contained in:
Ralf Becker 2007-06-03 15:01:27 +00:00
parent b970654f4f
commit 76d4884c94
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -270,23 +270,22 @@ class uitimesheet extends botimesheet
$content['all_pm_ids'] = array_values($links);
// set old id, pm selector (for later removal)
if (count($links) > 0) {
if (count($links) > 0)
{
$preserv['old_pm_id'] = array_shift($links);
}
if ($preserv['old_pm_id'] == '') {
$preserv['old_pm_id'] = $content['pm_id'];
}
if (!isset($this->data['pm_id']) && $preserv['old_pm_id']) {
if (!isset($this->data['pm_id']) && $preserv['old_pm_id'])
{
$content['pm_id'] = $preserv['old_pm_id'];
}
if ($content['pm_id'])
{
$preserv['ts_project_blur'] = $content['ts_project_blur'] = $this->link->title('projectmanager',$content['pm_id']);
}
if ($this->pm_integration == 'full')
{
$preserv['ts_project'] = $preserv['ts_project_blur'];
}
if ($this->pm_integration == 'full')
{
$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'];
$readonlys = array(
@ -319,9 +318,11 @@ class uitimesheet extends botimesheet
$etpl->set_cell_attribute('pl_id','disabled',true);
}
if($this->ts_viewtype == 'short') {
$content['ts_viewtype'] = /*$readonlys[$tabs]['links'] =*/ $readonlys[$tabs]['notes'] = true;
if($this->ts_viewtype == 'short')
{
$content['ts_viewtype'] = $readonlys[$tabs]['notes'] = true;
}
if (!$this->customfields) $readonlys[$tabs]['customfields'] = true; // suppress tab if there are not customfields
return $etpl->exec(TIMESHEET_APP.'.uitimesheet.edit',$content,array(
'ts_owner' => $edit_grants,