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

fixed handling of optgroups, eg. notification chains in prefs

Browse Source
This commit is contained in:
Ralf Becker 2014-01-10 07:08:45 +00:00
parent dbb4de0876
commit 243f20e98c
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
etemplate/inc/class.etemplate_widget_menupopup.inc.php
View File

@ -288,15 +288,26 @@ class etemplate_widget_menupopup extends etemplate_widget
$values = array(); $values = array();
foreach($options as $key => $val) foreach($options as $key => $val)
{ {
if (is_array($val) && isset($val['value'])) if (is_array($val))
{
if (isset($val['value']))
{ {
$values[] = $val['value']; $values[] = $val['value'];
} }
else // optgroup
{
foreach($val as $k => $v)
{
$values[] = is_array($v) && isset($v['value']) ? $v['value'] : $k;
}
}
}
else else
{ {
$values[] = $key; $values[] = $key;
} }
} }
//error_log(__METHOD__."('$name', TRUE) options=".array2string($options).' --> values='.array2string($values));
$options = $values; $options = $values;
} }
//error_log(__METHOD__."('$name') returning ".array2string($options)); //error_log(__METHOD__."('$name') returning ".array2string($options));

2
etemplate/js/et2_widget_selectbox.js
View File

@ -684,7 +684,7 @@ var et2_selectbox = et2_inputWidget.extend(
} }
else else
{ {
this._appendOptionElement(key, _options[key][sub],undefined,group); this._appendOptionElement(sub, _options[key][sub],undefined,group);
} }
} }
} }