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: use new inheritance helpers

This commit is contained in:
Thomas Gelf 2017-08-16 13:56:04 +02:00
parent a4e6d3251a
commit f65275bda7
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -175,7 +175,7 @@ abstract class DirectorObjectForm extends DirectorForm
}
try {
$object->templateResolver()->listResolvedParentIds();
$object->listAncestorIds();
} catch (NestingError $e) {
$this->addUniqueErrorMessage($e->getMessage());
return $this->resolvedImports = false;
@ -602,11 +602,13 @@ abstract class DirectorObjectForm extends DirectorForm
return $this->object !== null;
}
public function setObject(IcingaObject $object)
public function setObject(DbObject $object)
{
$this->object = $object;
if ($this->db === null) {
$this->setDb($object->getConnection());
/** @var Db $connection */
$connection = $object->getConnection();
$this->setDb($connection);
}
return $this;
@ -1037,7 +1039,7 @@ abstract class DirectorObjectForm extends DirectorForm
protected function addChoiceElement(IcingaTemplateChoice $choice)
{
$imports = $this->object()->get('imports');
$imports = $this->object()->listImportNames();
$element = $choice->createFormElement($this, $imports);
$this->addElement($element);
$this->choiceElements[$element->getName()] = $element;