extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-21 18:31:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix validation of taglist now send to select, specially using "id" attribute, if there is no "value"

Browse Source 
also check modifications of select_options, as done in preferences
fixes not validating mail preferences: toggleOnActions and contactLabel
This commit is contained in:
ralf 2022-08-10 14:39:19 +02:00
parent 1dedad6a3e
commit cad42eb6aa
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -506,10 +506,17 @@ class Select extends Etemplate\Widget
} }
// Check for options-$name in content // Check for options-$name in content
if (is_array(self::$request->content['options-'.$name])) if (isset(self::$request->content['options-'.$name]) && is_array(self::$request->content['options-'.$name]))
{ {
$options += self::$request->content['options-'.$name]; $options += self::$request->content['options-'.$name];
} }
// check modifications
if (isset(self::$request->modifications[$name]['select_options']) && is_array(self::$request->modifications[$name]['select_options']))
{
$options += self::$request->modifications[$name]['select_options'];
}
if ($return_values) if ($return_values)
{ {
$values = array(); $values = array();
@ -521,12 +528,17 @@ class Select extends Etemplate\Widget
{ {
$values[] = $val['value']; $values[] = $val['value'];
} }
else if ((isset($val['label']) || isset($val['title'])) && count($val) == 1 || elseif ((isset($val['label']) || isset($val['title'])) && count($val) == 1 ||
isset($val['title']) && isset($val['label']) && count($val) == 2) isset($val['title']) && isset($val['label']) && count($val) == 2)
{ {
// key => {label, title} // key => {label, title}
$values[] = $key; $values[] = $key;
} }
// support "id" used instead of "value" by old taglist
elseif (isset($val['id']))
{
$values[] = $val['id'];
}
else // optgroup else // optgroup
{ {
foreach($val as $k => $v) foreach($val as $k => $v)