extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-22 16:03:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Addressbook: with double-click preference set to edit, CRM-view did not open when selected in menu

Browse Source
This commit is contained in:
Ralf Becker 2014-10-16 09:32:13 +00:00
parent 004de5c81e
commit 47bf4d0824
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -384,11 +384,6 @@ class addressbook_hooks
), ),
'merge' => true, 'merge' => true,
); );
if($GLOBALS['egw_info']['user']['preferences']['addressbook']['crm_list'] == '~edit~')
{
$links['view'] = $links['edit'];
$links['view_popup'] = $links['edit_popup'];
}
return $links; return $links;
} }

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

@ -368,7 +368,7 @@ class addressbook_ui extends addressbook_bo
'default' => $GLOBALS['egw_info']['user']['preferences']['addressbook']['crm_list'] == '~edit~', 'default' => $GLOBALS['egw_info']['user']['preferences']['addressbook']['crm_list'] == '~edit~',
'allowOnMultiple' => false, 'allowOnMultiple' => false,
'url' => 'menuaction=addressbook.addressbook_ui.edit&contact_id=$id', '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, 'group' => $group,
), ),
'add' => array( 'add' => array(

4
addressbook/js/app.js
View File

@ -500,6 +500,8 @@ app.classes.addressbook = AppJS.extend(
/** /**
* Apply advanced search filters to index nextmatch * Apply advanced search filters to index nextmatch
*
* @param {object} filters
*/ */
adv_search: function(filters) adv_search: function(filters)
{ {
@ -576,7 +578,7 @@ app.classes.addressbook = AppJS.extend(
*/ */
addEmail: function(action, selected) addEmail: function(action, selected)
{ {
// Check for all selected. // Check for all selected.
var nm = this.et2.getWidgetById('nm'); var nm = this.et2.getWidgetById('nm');
if(fetchAll(selected, nm, jQuery.proxy(function(ids) { if(fetchAll(selected, nm, jQuery.proxy(function(ids) {
// fetchAll() returns just the ID, no prefix, so map it to match normal selected // fetchAll() returns just the ID, no prefix, so map it to match normal selected