From: <ral...@us...> - 2014-08-19 14:12:56
|
Author: ralfbecker Date: Tue Aug 19 16:12:40 2014 New Revision: 48129 URL: http://svn.stylite.de/viewvc/egroupware?rev=48129&view=rev Log: * Addressbook: no longer offering to move contacts to accounts addressbook, as we do not support that Modified: trunk/addressbook/inc/class.addressbook_ui.inc.php Modified: trunk/addressbook/inc/class.addressbook_ui.inc.php URL: http://svn.stylite.de/viewvc/egroupware/trunk/addressbook/inc/class.addressbook_ui.inc.php?rev=48129&r1=48128&r2=48129&view=diff ============================================================================== --- trunk/addressbook/inc/class.addressbook_ui.inc.php (original) +++ trunk/addressbook/inc/class.addressbook_ui.inc.php Tue Aug 19 16:12:40 2014 @@ -496,6 +496,7 @@ // move to AB if (($move2addressbooks = $this->get_addressbooks(EGW_ACL_ADD))) // do we have addressbooks, we should { + unset($move2addressbooks[0]); // do not offer action to move contact to an account, as we dont support that currrently foreach($move2addressbooks as $owner => $label) { $this->type_icon((int)$owner, substr($owner,-1) == 'p', 'n', $icon, $type_label); @@ -2066,6 +2067,7 @@ $sel_options['fileas_type'] = $this->fileas_options($content); $sel_options['owner'] = $this->get_addressbooks(EGW_ACL_ADD); + if ($content['owner']) unset($sel_options['owner'][0]); // do not offer to switch to accounts, as we do not support moving contacts to accounts if ((string) $content['owner'] !== '') { if (!isset($sel_options['owner'][(int)$content['owner']])) |