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

IcingaObject: provide combined keys for imports

Browse Source
This commit is contained in:
Thomas Gelf 2015-12-10 12:11:54 +01:00
parent 81efcd0e8e
commit 79748f0c4c
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -267,7 +267,15 @@ abstract class IcingaObject extends DbObject implements IcingaConfigRenderer
if ($this->importedObjects === null) { if ($this->importedObjects === null) {
$this->importedObjects = array(); $this->importedObjects = array();
foreach ($this->imports()->listImportNames() as $import) { foreach ($this->imports()->listImportNames() as $import) {
$this->importedObjects[$import] = self::load($import, $this->connection); if (is_array($this->getKeyName())) {
// Affects services only:
$this->importedObjects[$import] = self::load(
array('object_name' => $import),
$this->connection
);
} else {
$this->importedObjects[$import] = self::load($import, $this->connection);
}
} }
} }