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

IcingaObject: fix "origins" names when showing... 

...inherited properties

fixes #1093
This commit is contained in:
Thomas Gelf 2017-08-22 17:47:27 +02:00
parent b3ae6ea68b
commit 15c26b97db
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1124,7 +1124,8 @@ abstract class IcingaObject extends DbObject implements IcingaConfigRenderer
$vals['_INHERITED_'] = (object) array(); $vals['_INHERITED_'] = (object) array();
$vals['_ORIGINS_'] = (object) array(); $vals['_ORIGINS_'] = (object) array();
// $objects = $this->imports()->getObjects(); // $objects = $this->imports()->getObjects();
$objects = IcingaTemplateRepository::instanceByObject($this)->getTemplatesFor($this); $objects = IcingaTemplateRepository::instanceByObject($this)
->getTemplatesIndexedByNameFor($this);
$get = 'get' . $what; $get = 'get' . $what;
$getInherited = 'getInherited' . $what; $getInherited = 'getInherited' . $what;