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

TemplateTree: fix resolving commands 

They allow to inherit from non-templates and need special treatment

refs #1084
This commit is contained in:
Thomas Gelf 2017-08-21 15:47:21 +02:00
parent 7b2e13f9c1
commit 089197d2c5
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
library/Director/Resolver/TemplateTree.php
View File

@ -144,6 +144,9 @@ class TemplateTree
$names = $object->imports()->listImportNames();
$ancestors = [];
foreach ($names as $name) {
if (! array_key_exists($name, $this->templateNameToId)) {
continue;
}
$pid = $this->templateNameToId[$name];
$this->getAncestorsById($pid, $ancestors);
@ -284,11 +287,6 @@ class TemplateTree
$children = [];
$names = [];
foreach ($templates as $row) {
if ($row->object_type === 'object') {
$row->id = $row->parent_id;
$row->object_name = $row->parent_name;
$row->parent_name = $row->parent_id = null;
}
$id = (int) $row->id;
$pid = (int) $row->parent_id;
$names[$id] = $row->name;
@ -371,12 +369,7 @@ class TemplateTree
[]
)->order('o.id')->order('i.weight');
if ($type === 'command') {
$query->where(
'o.object_type = ? OR p.id IS NOT NULL',
'template'
);
} else {
if ($type !== 'command') {
$query->where(
'o.object_type = ?',
'template'