lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NEW Add showempty parameter in country selection

Browse Source
This commit is contained in:
Laurent Destailleur 2018-02-13 19:08:46 +01:00
parent 4f369bd746
commit b128c95a74
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
htdocs/core/class/html.form.class.php
View File

@ -646,9 +646,10 @@ class Form
* @param integer $maxlength Max length for labels (0=no limit) * @param integer $maxlength Max length for labels (0=no limit)
* @param string $morecss More css class * @param string $morecss More css class
* @param string $usecodeaskey 'code3'=Use code on 3 alpha as key, 'code2"=Use code on 2 alpha as key * @param string $usecodeaskey 'code3'=Use code on 3 alpha as key, 'code2"=Use code on 2 alpha as key
* @param int $showempty Show empty choice
* @return string HTML string with select * @return string HTML string with select
*/ */
function select_country($selected='',$htmlname='country_id',$htmloption='',$maxlength=0,$morecss='minwidth300',$usecodeaskey='') function select_country($selected='', $htmlname='country_id', $htmloption='', $maxlength=0, $morecss='minwidth300', $usecodeaskey='', $showempty=1)
{ {
global $conf,$langs; global $conf,$langs;
@ -693,20 +694,22 @@ class Form
foreach ($countryArray as $row) foreach ($countryArray as $row)
{ {
if (empty($showempty) && empty($row['rowid'])) continue;
if ($row['favorite'] && $row['code_iso']) $atleastonefavorite++; if ($row['favorite'] && $row['code_iso']) $atleastonefavorite++;
if (empty($row['favorite']) && $atleastonefavorite) if (empty($row['favorite']) && $atleastonefavorite)
{ {
$atleastonefavorite=0; $atleastonefavorite=0;
$out.= '<option a value="" disabled class="selectoptiondisabledwhite">----------------------</option>'; $out.= '<option value="" disabled class="selectoptiondisabledwhite">----------------------</option>';
} }
if ($selected && $selected != '-1' && ($selected == $row['rowid'] || $selected == $row['code_iso'] || $selected == $row['code_iso3'] || $selected == $row['label']) ) if ($selected && $selected != '-1' && ($selected == $row['rowid'] || $selected == $row['code_iso'] || $selected == $row['code_iso3'] || $selected == $row['label']) )
{ {
$foundselected=true; $foundselected=true;
$out.= '<option b value="'.($usecodeaskey?($usecodeaskey=='code2'?$row['code_iso']:$row['code_iso3']):$row['rowid']).'" selected>'; $out.= '<option value="'.($usecodeaskey?($usecodeaskey=='code2'?$row['code_iso']:$row['code_iso3']):$row['rowid']).'" selected>';
} }
else else
{ {
$out.= '<option c value="'.($usecodeaskey?($usecodeaskey=='code2'?$row['code_iso']:$row['code_iso3']):$row['rowid']).'">'; $out.= '<option value="'.($usecodeaskey?($usecodeaskey=='code2'?$row['code_iso']:$row['code_iso3']):$row['rowid']).'">';
} }
if ($row['label']) $out.= dol_trunc($row['label'],$maxlength,'middle'); if ($row['label']) $out.= dol_trunc($row['label'],$maxlength,'middle');
else $out.= '&nbsp;'; else $out.= '&nbsp;';