holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Admin - allow empty values (=Select one) as first option for custom select

Browse Source
This commit is contained in:
nathangray 2019-04-09 11:59:31 -06:00
parent 46e1867e7f
commit 69f1b51c57
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
admin/inc/class.admin_customfields.inc.php
View File

@ -345,14 +345,14 @@ class admin_customfields
} }
else else
{ {
foreach(explode("\n",trim($content['cf_values'])) as $line) foreach(explode("\n",trim($content['cf_values'])) as $idx => $line)
{ {
list($var_raw,$value) = explode('=',trim($line),2); list($var_raw,$value) = explode('=',trim($line),2);
$var = trim($var_raw); $var = trim($var_raw);
if (!preg_match(self::CHECK_MULTISELCT_VALUE, $var)) if (!preg_match(self::CHECK_MULTISELCT_VALUE, $var) && !($idx == 0 && !$var && $value))
{ {
Api\Etemplate::set_validation_error('cf_values', Api\Etemplate::set_validation_error('cf_values',
lang('Invalide value "%1", use only:', $var)."\n". lang('Invalid value "%1", use only:', $var)."\n".
preg_replace('/^.*\[([^]]+)\].*$/', '$1', self::CHECK_MULTISELCT_VALUE)); preg_replace('/^.*\[([^]]+)\].*$/', '$1', self::CHECK_MULTISELCT_VALUE));
$action = 'apply'; // do not close the window to show validation error $action = 'apply'; // do not close the window to show validation error
if (!$cf_id) break 2; // only stop storing of new CFs if (!$cf_id) break 2; // only stop storing of new CFs