tyler.durden/icingaweb2-module-director
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2-module-director.git synced 2025-07-28 08:14:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

ObjectApplyMatches: resolve imports/templates

Browse Source 
fixes #1676
This commit is contained in:
Thomas Gelf 2018-10-15 12:16:35 +02:00
parent 0349a1042a
commit c119c47864
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
library/Director/Objects/IcingaObject.php
View File

@ -2945,6 +2945,11 @@ abstract class IcingaObject extends DbObject implements IcingaConfigRenderer
} }
} }
public function listFlatResolvedImportNames()
{
return $this->templateTree()->getAncestorsFor($this);
}
public function listImportIds() public function listImportIds()
{ {
return $this->templateTree()->listParentIdsFor($this); return $this->templateTree()->listParentIdsFor($this);

3
library/Director/Objects/ObjectApplyMatches.php
View File

@ -212,9 +212,8 @@ abstract class ObjectApplyMatches
$this->object = $object; $this->object = $object;
$this->flatObject = $object->toPlainObject(true, false); $this->flatObject = $object->toPlainObject(true, false);
// Sure, we are flat - but we might still want to match templates. // Sure, we are flat - but we might still want to match templates.
// TODO: Flatten the whole tree
unset($this->flatObject->imports); unset($this->flatObject->imports);
$this->flatObject->templates = $object->imports()->listImportNames(); $this->flatObject->templates = $object->listFlatResolvedImportNames();
static::flattenVars($this->flatObject); static::flattenVars($this->flatObject);
} }
} }