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

Etemplate - change select multiple validation to also consider rows > 1 to enable multiple

Browse Source
This commit is contained in:
nathangray 2017-09-14 09:18:28 -06:00
parent ef50e36b49
commit 5b4fd418bf
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api/src/Etemplate/Widget/Select.php
View File

@ -129,6 +129,7 @@ class Select extends Etemplate\Widget
{ {
$form_name = self::form_name($cname, $this->id, $expand); $form_name = self::form_name($cname, $this->id, $expand);
$widget_type = $this->attrs['type'] ? $this->attrs['type'] : $this->type; $widget_type = $this->attrs['type'] ? $this->attrs['type'] : $this->type;
$multiple = $this->attrs['multiple'] || $this->getElementAttribute($form_name, 'rows') > 1;
$ok = true; $ok = true;
if (!$this->is_readonly($cname, $form_name)) if (!$this->is_readonly($cname, $form_name))
@ -147,7 +148,7 @@ class Select extends Etemplate\Widget
if ($child->type == 'option') $allowed[] = (string)$child->attrs['value']; if ($child->type == 'option') $allowed[] = (string)$child->attrs['value'];
} }
if (!$this->attrs['multiple'] || !($this->attrs['options'] > 1)) $allowed[] = ''; if (!$multiple ) $allowed[] = '';
foreach((array) $value as $val) foreach((array) $value as $val)
{ {
@ -198,7 +199,7 @@ class Select extends Etemplate\Widget
{ {
self::set_validation_error($form_name,lang('Field must not be empty !!!',$value),''); self::set_validation_error($form_name,lang('Field must not be empty !!!',$value),'');
} }
if (!$this->attrs['multiple'] && is_array($value) && count($value) > 1) if (!$multiple && is_array($value) && count($value) > 1)
{ {
$value = array_shift($value); $value = array_shift($value);
} }