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

If opening window is not addressbook, update addressbook window too

Browse Source
This commit is contained in:
Nathan Gray 2012-11-09 18:38:48 +00:00
parent 2ecd33725d
commit 4420b4b115
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addressbook/inc/class.addressbook_ui.inc.php
View File

@ -1641,7 +1641,8 @@ class addressbook_ui extends addressbook_bo
{ {
egw_link::link('addressbook',$content['id'],$links); egw_link::link('addressbook',$content['id'],$links);
} }
$content['js'] = "opener.egw_refresh('".str_replace("'","\\'",$content['msg'])."','addressbook',{$content['id']});"; $content['js'] = "opener.egw_refresh('".str_replace("'","\\'",$content['msg'])."','addressbook',{$content['id']}); if(opener.egw_getAppName() != 'addressbook') { opener.egw_refresh('".str_replace("'","\\'",$content['msg'])."','addressbook',{$content['id']},null,'addressbook');}";
error_log($GLOBALS['egw_info']['flags']['currentapp']);
if ($button == 'save') if ($button == 'save')
{ {
$content['js'] .= ' window.close();'; $content['js'] .= ' window.close();';
@ -1655,7 +1656,7 @@ class addressbook_ui extends addressbook_bo
case 'delete': case 'delete':
if($this->action('delete',array($content['id']),false,$success,$failed,$action_msg,'',$content['msg'])) if($this->action('delete',array($content['id']),false,$success,$failed,$action_msg,'',$content['msg']))
{ {
$js = "opener.egw_refresh('".str_replace("'","\\'",lang('Contact deleted'))."','addressbook',{$content['id']},'delete'); window.close();"; $js = "opener.egw_refresh('".str_replace("'","\\'",lang('Contact deleted'))."','addressbook',{$content['id']},'delete'); if(opener.egw_getAppName() != 'addressbook') { opener.egw_refresh('".str_replace("'","\\'",lang('Contact deleted'))."','addressbook',{$content['id']},null,'addressbook');} window.close();";
echo '<html><body onload="'.$js.'"></body></html>'; echo '<html><body onload="'.$js.'"></body></html>';
common::egw_exit(); common::egw_exit();
} }