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

DirectorObjectForm: improve import handling

This commit is contained in:
Thomas Gelf 2015-07-30 11:43:33 +02:00
parent 6187777d08
commit 2643b6ae8c
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
library/Director/Web/Form/DirectorObjectForm.php
View File

@ -116,10 +116,16 @@ abstract class DirectorObjectForm extends QuickForm
if ($object->supportsImports()) {
if (array_key_exists('imports', $values)) {
$object->imports()->set(
preg_split('/\s*,\s*/', $values['imports'], -1, PREG_SPLIT_NO_EMPTY)
);
$value = $values['imports'];
// TODO: Compat for comma separated string, check if still needed
if (! is_array($value)) {
$value = preg_split('/\s*,\s*/', $value, -1, PREG_SPLIT_NO_EMPTY);
}
$object->imports()->set($value);
$handled['imports'] = true;
$object->clearImportedObjects();
}
}
@ -268,10 +274,12 @@ abstract class DirectorObjectForm extends QuickForm
);
}
if ($this->object->supportsImports()) {
$this->getElement('imports')->setValue(
implode(', ', $this->object->imports()->listImportNames())
);
if ($object->supportsImports()) {
$el = $this->getElement('imports');
if ($el) {
$el->setMultiOptions($this->enumAllowedTemplates());
$el->setValue($object->imports()->listImportNames());
}
}
if ($this->object->supportsCustomVars()) {