IcingaObject: provide combined keys for imports

This commit is contained in:
Thomas Gelf 2015-12-10 12:11:54 +01:00
parent 81efcd0e8e
commit 79748f0c4c

View File

@ -267,7 +267,15 @@ abstract class IcingaObject extends DbObject implements IcingaConfigRenderer
if ($this->importedObjects === null) {
$this->importedObjects = array();
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);
}
}
}