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

- Add ajax flag in a few missed places to keep out of iframe

Browse Source 
- Fix loading of old nextmatch_action.js
This commit is contained in:
Nathan Gray 2013-11-27 00:12:11 +00:00
parent 1b4d6049f5
commit d7a075200d
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
addressbook/inc/class.addressbook_hooks.inc.php
View File

@ -363,10 +363,14 @@ class addressbook_hooks
'title' => 'addressbook.addressbook_bo.link_title', 'title' => 'addressbook.addressbook_bo.link_title',
'titles' => 'addressbook.addressbook_bo.link_titles', 'titles' => 'addressbook.addressbook_bo.link_titles',
'view' => array( 'view' => array(
'menuaction' => 'addressbook.addressbook_ui.view' 'menuaction' => 'addressbook.addressbook_ui.view',
'ajax' => 'true'
), ),
'view_id' => 'contact_id', 'view_id' => 'contact_id',
'view_list' => 'addressbook.addressbook_ui.index', 'list' => array(
'menuaction' => 'addressbook.addressbook_ui.index',
'ajax' => 'true'
),
'edit' => array( 'edit' => array(
'menuaction' => 'addressbook.addressbook_ui.edit' 'menuaction' => 'addressbook.addressbook_ui.edit'
), ),
@ -386,7 +390,8 @@ class addressbook_hooks
'addressbook-email' => array( 'addressbook-email' => array(
'query' => 'addressbook.addressbook_bo.link_query_email', 'query' => 'addressbook.addressbook_bo.link_query_email',
'view' => array( 'view' => array(
'menuaction' => 'addressbook.addressbook_ui.view' 'menuaction' => 'addressbook.addressbook_ui.view',
'ajax' => 'true'
), ),
'view_id' => 'contact_id', 'view_id' => 'contact_id',
), ),

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

@ -345,7 +345,7 @@ class addressbook_ui extends addressbook_bo
'caption' => 'View', 'caption' => 'View',
'default' => true, 'default' => true,
'allowOnMultiple' => false, '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'), 'popup' => egw_link::get_registry('addressbook', 'view_popup'),
'group' => $group=1, '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']); egw::redirect_link('/index.php','menuaction=addressbook.uivcard.out&ab_id=' .$content['id']);
case 'cancel': 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': case 'delete':
egw::redirect_link('/index.php',array( egw::redirect_link('/index.php',array(
@ -2113,6 +2113,7 @@ window.egw_LAB.wait(function() {
egw::redirect_link('/index.php',array( egw::redirect_link('/index.php',array(
'menuaction' => 'addressbook.addressbook_ui.index', 'menuaction' => 'addressbook.addressbook_ui.index',
'msg' => $content, 'msg' => $content,
'ajax' => 'true'
)); ));
} }
} }
@ -2209,9 +2210,7 @@ window.egw_LAB.wait(function() {
// set id for automatic linking via quick add // set id for automatic linking via quick add
$GLOBALS['egw_info']['flags']['currentid'] = $content['id']; $GLOBALS['egw_info']['flags']['currentid'] = $content['id'];
// Load JS for infolog actions // Load JS for infolog actions
egw_framework::validate_file('.','index','infolog'); egw_framework::validate_file('.','app','infolog');
// Load egw_action stuff for infolog, required before etemplate::exec() because it loads stuff into HTML header
nextmatch_widget::init_egw_actions();
$this->tmpl->exec('addressbook.addressbook_ui.view',$content,$sel_options,$readonlys,array('id' => $content['id'])); $this->tmpl->exec('addressbook.addressbook_ui.view',$content,$sel_options,$readonlys,array('id' => $content['id']));