From f9e573f5cc716d666b9085231a22da235afeeb4d Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 17 Oct 2014 12:51:49 +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 17880b046b..09181a457c 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 e46a06e9d2..aa9f6437d8 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 131be8034d..b30dfa4b49 100644
--- a/addressbook/js/app.js
+++ b/addressbook/js/app.js
@@ -492,6 +492,8 @@ app.classes.addressbook = AppJS.extend(
 
 	/**
 	 * Apply advanced search filters to index nextmatch
+	 *
+	 * @param {object} filters
 	 */
 	adv_search: function(filters)
 	{
@@ -568,7 +570,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