holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Try to fix infolog contact and projectmanager links handler

Browse Source
This commit is contained in:
Hadi Nategh 2017-01-12 15:13:44 +01:00
parent da8bb01e33
commit 807e812f5b
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
infolog/inc/class.infolog_ui.inc.php
View File

@ -1736,7 +1736,7 @@ class infolog_ui
if (($button == 'save' || $button == 'apply') && (!$info_id || $edit_acl || $status_only || $undelete)) if (($button == 'save' || $button == 'apply') && (!$info_id || $edit_acl || $status_only || $undelete))
{ {
$operation = $info_id ? 'edit' : 'add'; $operation = $info_id ? 'edit' : 'add';
if (is_array($content['link_to']['to_id']) && count($content['link_to']['to_id'])) if (is_array($content['link_to']['to_id']) && count($content['link_to']['to_id']))
{ {
$content['info_link_id'] = 0; // as field has to be int $content['info_link_id'] = 0; // as field has to be int
@ -1772,6 +1772,11 @@ class infolog_ui
Framework::refresh_opener($content['msg'],'infolog',$info_id,$operation); Framework::refresh_opener($content['msg'],'infolog',$info_id,$operation);
} }
$content['tabs'] = $active_tab; $content['tabs'] = $active_tab;
//try to keep the project manager link if the intenstion is only to remove contact
if ($old['info_link']['app'] == 'projectmanager' && $old['info_link']['id'] = $content['pm_id'])
{
Link::link('infolog',$content['link_to']['to_id'],'projectmanager',$content['pm_id']);
}
if ((int) $content['pm_id'] != (int) $content['old_pm_id']) if ((int) $content['pm_id'] != (int) $content['old_pm_id'])
{ {
//echo "<p>pm_id changed: $content[old_pm_id] -> $content[pm_id]</p>\n"; //echo "<p>pm_id changed: $content[old_pm_id] -> $content[pm_id]</p>\n";
@ -1813,6 +1818,14 @@ class infolog_ui
); );
//echo "<p>updating info_link_id: ".print_r($to_write,true)."</p>\n"; //echo "<p>updating info_link_id: ".print_r($to_write,true)."</p>\n";
$this->bo->write($to_write,False,true,true,true); // last true = no notifications, as no real change $this->bo->write($to_write,False,true,true,true); // last true = no notifications, as no real change
// Do not override info_contact if is already filled with contact
if ($content['info_contact'])
{
unset($to_write['info_contact']);
unset($to_write['blur_title']);
}
// we need eg. the new modification date, for further updates // we need eg. the new modification date, for further updates
$content = array_merge($content,$to_write); $content = array_merge($content,$to_write);
} }