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

Merge pull request #7445 from hregis/develop_trad

Browse Source 
Fix: check if array and check empty value if required
This commit is contained in:
Laurent Destailleur 2017-09-20 17:38:00 +02:00 committed by GitHub
commit 81596b503c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/core/class/extrafields.class.php
View File

@ -1708,7 +1708,7 @@ class ExtraFields
if (! empty($onlykey) && $key != $onlykey) continue; if (! empty($onlykey) && $key != $onlykey) continue;
$key_type = $this->attribute_type[$key]; $key_type = $this->attribute_type[$key];
if($this->attribute_required[$key] && !GETPOST("options_$key",2)) if ($this->attribute_required[$key] && empty($_POST["options_".$key])) // Check if empty without GETPOST, value can be alpha, int, array, etc...
{ {
$nofillrequired++; $nofillrequired++;
$error_field_required[] = $value; $error_field_required[] = $value;
@ -1721,7 +1721,7 @@ class ExtraFields
} }
else if (in_array($key_type,array('checkbox','chkbxlst'))) else if (in_array($key_type,array('checkbox','chkbxlst')))
{ {
$value_arr=GETPOST("options_".$key); $value_arr=GETPOST("options_".$key, 'array'); // check if an array
if (!empty($value_arr)) { if (!empty($value_arr)) {
$value_key=implode($value_arr,','); $value_key=implode($value_arr,',');
}else { }else {
@ -1740,7 +1740,7 @@ class ExtraFields
$object->array_options["options_".$key]=$value_key; $object->array_options["options_".$key]=$value_key;
} }
if($nofillrequired) { if ($nofillrequired) {
$langs->load('errors'); $langs->load('errors');
setEventMessages($langs->trans('ErrorFieldsRequired').' : '.implode(', ',$error_field_required), null, 'errors'); setEventMessages($langs->trans('ErrorFieldsRequired').' : '.implode(', ',$error_field_required), null, 'errors');
return -1; return -1;