tyler.durden
/
icingaweb2-module-director
mirror of https://github.com/Icinga/icingaweb2-module-director.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FormExtensibleSet: fix unsetting choosen values... 

...for elements with nested choices
This commit is contained in:
Thomas Gelf 2016-03-18 20:12:36 +01:00
parent 4e70a4a003
commit 3f1d2c6876
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
application/views/helpers/FormExtensibleSet.php
View File

@ -78,7 +78,7 @@ class Zend_View_Helper_FormExtensibleSet extends Zend_View_Helper_FormElement
if ($multiOptions !== null) { if ($multiOptions !== null) {
if (in_array($val, $validOptions)) { if (in_array($val, $validOptions)) {
$this->removeOption($multiOptions, $val); $multiOptions = $this->removeOption($multiOptions, $val);
} else { } else {
continue; // Value no longer valid continue; // Value no longer valid
} }
@ -166,20 +166,25 @@ class Zend_View_Helper_FormExtensibleSet extends Zend_View_Helper_FormElement
return $flat; return $flat;
} }
private function removeOption(& $options, $option) private function removeOption($options, $option)
{ {
foreach ($options as $key => $value) { $unset = array();
foreach ($options as $key => & $value) {
if (is_array($value)) { if (is_array($value)) {
if ($this->removeOption($value, $option)) { $value = $this->removeOption($value, $option);
return true; if (empty($value)) {
$unset[] = $key;
} }
} elseif ($key === $option) { } elseif ($key === $option) {
unset($options[$key]); $unset[] = $key;
return true;
} }
} }
return false; foreach ($unset as $key) {
unset($options[$key]);
}
return $options;
} }
private function suffix($cnt) private function suffix($cnt)