From 27d88b93ecd0a6f8bfe21a9d19275d447b8ebc25 Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Wed, 15 Apr 2015 15:57:19 +0000 Subject: [PATCH] Country list no longer supports options, so include custom in sel_options --- addressbook/inc/class.addressbook_ui.inc.php | 2 ++ addressbook/templates/default/index.xet | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/addressbook/inc/class.addressbook_ui.inc.php b/addressbook/inc/class.addressbook_ui.inc.php index bb369d4302..9c400e2d4c 100644 --- a/addressbook/inc/class.addressbook_ui.inc.php +++ b/addressbook/inc/class.addressbook_ui.inc.php @@ -299,6 +299,7 @@ class addressbook_ui extends addressbook_bo 'cc' => 'Cc', 'bcc' => 'Bcc', ); + $sel_options['adr_one_countrycode']['-custom-'] = lang('No country selected'); // if there is any export limit set, pass it on to the nextmatch, to be evaluated by the export if (isset($this->config['contact_export_limit']) && (int)$this->config['contact_export_limit']) $content['nm']['export_limit']=$this->config['contact_export_limit']; @@ -2175,6 +2176,7 @@ window.egw_LAB.wait(function() { $readonlys['button[save]'] = $readonlys['button[apply]'] = $view; $sel_options['fileas_type'] = $this->fileas_options($content); + $sel_options['adr_one_countrycode']['-custom-'] = lang('Custom'); $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'] !== '') diff --git a/addressbook/templates/default/index.xet b/addressbook/templates/default/index.xet index e8c3273118..9db2723082 100644 --- a/addressbook/templates/default/index.xet +++ b/addressbook/templates/default/index.xet @@ -76,12 +76,12 @@ - + - +