extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-10-06 18:22:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Country list no longer supports options, so include custom in sel_options

Browse Source
This commit is contained in:
Nathan Gray 2015-04-16 14:53:07 +00:00
parent 1af6f3a707
commit 4c7dc4d6dd
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -297,6 +297,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'];
@ -2157,6 +2158,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'] !== '')

4
addressbook/templates/default/index.xet
View File

@ -76,12 +76,12 @@
<nextmatch-header label="Birthday" id="bday"/>
<vbox>
<nextmatch-header label="Business address" id="business"/>
<nextmatch-customfilter id="adr_one_countrycode" options="select-country,Country,0,No country selected" class="countrySelect"/>
<nextmatch-customfilter id="adr_one_countrycode" options="select-country" empty_label="Country" class="countrySelect"/>
<nextmatch-sortheader label="zip code" id="adr_one_postalcode"/>
</vbox>
<vbox>
<nextmatch-header label="Home address" id="home"/>
<nextmatch-customfilter id="adr_two_countrycode" options="select-country,Country,0,No country selected" class="countrySelect"/>
<nextmatch-customfilter id="adr_two_countrycode" options="select-country" empty_label="Country" class="countrySelect"/>
<nextmatch-sortheader label="zip code" id="adr_two_postalcode"/>
</vbox>
<vbox>