mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-22 23:00:56 +01:00
bugfix: new InfoLog entries created from within addressbook or projectmanager had no primary link
This commit is contained in:
parent
8677de7c25
commit
691aa4d9dc
@ -522,7 +522,7 @@
|
|||||||
case 'calendar':
|
case 'calendar':
|
||||||
default: // to allow other apps to participate
|
default: // to allow other apps to participate
|
||||||
$content['info_link_id'] = $this->link->link('infolog',$content['link_to']['to_id'],$action,$action_id);
|
$content['info_link_id'] = $this->link->link('infolog',$content['link_to']['to_id'],$action,$action_id);
|
||||||
// $content['blur_title'] = $this->link->title($action,$action_id);
|
$content['blur_title'] = $this->link->title($action,$action_id);
|
||||||
|
|
||||||
case '':
|
case '':
|
||||||
if ($info_id)
|
if ($info_id)
|
||||||
@ -539,16 +539,14 @@
|
|||||||
$content['info_status'] = $this->bo->status['defaults'][$content['info_type']];
|
$content['info_status'] = $this->bo->status['defaults'][$content['info_type']];
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
$content['link_to']['primary'] = (int)$content['info_link_id'];
|
// we allways need to set a non-empty/-zero primary, to make the radiobutton appear
|
||||||
|
$content['link_to']['primary'] = $content['info_link_id'] ? $content['info_link_id'] : '#';
|
||||||
|
|
||||||
if (!isset($this->bo->enums['type'][$content['info_type']]))
|
if (!isset($this->bo->enums['type'][$content['info_type']]))
|
||||||
{
|
{
|
||||||
$content['info_type'] = 'note';
|
$content['info_type'] = 'note';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if ($action && $action != 'new' && $action != 'sp')
|
|
||||||
{
|
|
||||||
$content['blur_title'] = $this->link->title($action,$action_id);
|
|
||||||
}
|
|
||||||
$readonlys['delete'] = !$info_id || !$this->bo->check_access($info_id,EGW_ACL_DELETE);
|
$readonlys['delete'] = !$info_id || !$this->bo->check_access($info_id,EGW_ACL_DELETE);
|
||||||
|
|
||||||
$GLOBALS['egw_info']['flags']['app_header'] = lang($this->messages[$info_id ? 'edit' : ($action == 'sp' ? 'add_sub' : 'add')]);
|
$GLOBALS['egw_info']['flags']['app_header'] = lang($this->messages[$info_id ? 'edit' : ($action == 'sp' ? 'add_sub' : 'add')]);
|
||||||
|
Loading…
Reference in New Issue
Block a user