diff --git a/addressbook/inc/class.addressbook_hooks.inc.php b/addressbook/inc/class.addressbook_hooks.inc.php index bc58770c3c..fc25d51956 100644 --- a/addressbook/inc/class.addressbook_hooks.inc.php +++ b/addressbook/inc/class.addressbook_hooks.inc.php @@ -363,10 +363,14 @@ class addressbook_hooks 'title' => 'addressbook.addressbook_bo.link_title', 'titles' => 'addressbook.addressbook_bo.link_titles', 'view' => array( - 'menuaction' => 'addressbook.addressbook_ui.view' + 'menuaction' => 'addressbook.addressbook_ui.view', + 'ajax' => 'true' ), 'view_id' => 'contact_id', - 'view_list' => 'addressbook.addressbook_ui.index', + 'list' => array( + 'menuaction' => 'addressbook.addressbook_ui.index', + 'ajax' => 'true' + ), 'edit' => array( 'menuaction' => 'addressbook.addressbook_ui.edit' ), @@ -386,7 +390,8 @@ class addressbook_hooks 'addressbook-email' => array( 'query' => 'addressbook.addressbook_bo.link_query_email', 'view' => array( - 'menuaction' => 'addressbook.addressbook_ui.view' + 'menuaction' => 'addressbook.addressbook_ui.view', + 'ajax' => 'true' ), 'view_id' => 'contact_id', ), diff --git a/addressbook/inc/class.addressbook_ui.inc.php b/addressbook/inc/class.addressbook_ui.inc.php index 2ffda9d577..9330aacd89 100644 --- a/addressbook/inc/class.addressbook_ui.inc.php +++ b/addressbook/inc/class.addressbook_ui.inc.php @@ -345,7 +345,7 @@ class addressbook_ui extends addressbook_bo 'caption' => 'View', 'default' => true, 'allowOnMultiple' => false, - 'url' => 'menuaction=addressbook.addressbook_ui.view&contact_id=$id', + 'url' => 'menuaction=addressbook.addressbook_ui.view&contact_id=$id&ajax=true', 'popup' => egw_link::get_registry('addressbook', 'view_popup'), 'group' => $group=1, ), @@ -2096,7 +2096,7 @@ window.egw_LAB.wait(function() { egw::redirect_link('/index.php','menuaction=addressbook.uivcard.out&ab_id=' .$content['id']); case 'cancel': - egw::redirect_link('/index.php','menuaction=addressbook.addressbook_ui.index'); + egw::redirect_link('/index.php','menuaction=addressbook.addressbook_ui.index&ajax=true'); case 'delete': egw::redirect_link('/index.php',array( @@ -2113,6 +2113,7 @@ window.egw_LAB.wait(function() { egw::redirect_link('/index.php',array( 'menuaction' => 'addressbook.addressbook_ui.index', 'msg' => $content, + 'ajax' => 'true' )); } } @@ -2209,9 +2210,7 @@ window.egw_LAB.wait(function() { // set id for automatic linking via quick add $GLOBALS['egw_info']['flags']['currentid'] = $content['id']; // Load JS for infolog actions - egw_framework::validate_file('.','index','infolog'); - // Load egw_action stuff for infolog, required before etemplate::exec() because it loads stuff into HTML header - nextmatch_widget::init_egw_actions(); + egw_framework::validate_file('.','app','infolog'); $this->tmpl->exec('addressbook.addressbook_ui.view',$content,$sel_options,$readonlys,array('id' => $content['id']));