From 47bf4d0824e7e637ce837dc31d7ca1e0d7b1afbd Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Thu, 16 Oct 2014 09:32:13 +0000 Subject: [PATCH] * Addressbook: with double-click preference set to edit, CRM-view did not open when selected in menu --- addressbook/inc/class.addressbook_hooks.inc.php | 5 ----- addressbook/inc/class.addressbook_ui.inc.php | 2 +- addressbook/js/app.js | 4 +++- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/addressbook/inc/class.addressbook_hooks.inc.php b/addressbook/inc/class.addressbook_hooks.inc.php index 3915d0f1c2..ba6c46d960 100644 --- a/addressbook/inc/class.addressbook_hooks.inc.php +++ b/addressbook/inc/class.addressbook_hooks.inc.php @@ -384,11 +384,6 @@ class addressbook_hooks ), 'merge' => true, ); - if($GLOBALS['egw_info']['user']['preferences']['addressbook']['crm_list'] == '~edit~') - { - $links['view'] = $links['edit']; - $links['view_popup'] = $links['edit_popup']; - } return $links; } diff --git a/addressbook/inc/class.addressbook_ui.inc.php b/addressbook/inc/class.addressbook_ui.inc.php index 88f5deb001..4182521266 100644 --- a/addressbook/inc/class.addressbook_ui.inc.php +++ b/addressbook/inc/class.addressbook_ui.inc.php @@ -368,7 +368,7 @@ class addressbook_ui extends addressbook_bo 'default' => $GLOBALS['egw_info']['user']['preferences']['addressbook']['crm_list'] == '~edit~', 'allowOnMultiple' => false, 'url' => 'menuaction=addressbook.addressbook_ui.edit&contact_id=$id', - 'popup' => egw_link::get_registry('addressbook', 'add_popup'), + 'popup' => egw_link::get_registry('addressbook', 'edit_popup'), 'group' => $group, ), 'add' => array( diff --git a/addressbook/js/app.js b/addressbook/js/app.js index 4dc5392133..8cf0529b0e 100644 --- a/addressbook/js/app.js +++ b/addressbook/js/app.js @@ -500,6 +500,8 @@ app.classes.addressbook = AppJS.extend( /** * Apply advanced search filters to index nextmatch + * + * @param {object} filters */ adv_search: function(filters) { @@ -576,7 +578,7 @@ app.classes.addressbook = AppJS.extend( */ addEmail: function(action, selected) { - // Check for all selected. + // Check for all selected. var nm = this.et2.getWidgetById('nm'); if(fetchAll(selected, nm, jQuery.proxy(function(ids) { // fetchAll() returns just the ID, no prefix, so map it to match normal selected