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

IcingaObject: getRenderingZone() must succeed...

Browse Source 
...even when no config is given

refs #1394
This commit is contained in:
Thomas Gelf 2018-02-20 15:56:17 +01:00
parent 56f44b9ff1
commit 41e379b008
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1586,15 +1586,30 @@ abstract class IcingaObject extends DbObject implements IcingaConfigRenderer
if ($this->hasProperty('zone_id')) { if ($this->hasProperty('zone_id')) {
if (! $this->supportsImports()) { if (! $this->supportsImports()) {
if ($zoneId = $this->get('zone_id')) { if ($zoneId = $this->get('zone_id')) {
// Config has a lookup cache, is faster: // TODO: this is ugly.
return $config->getZoneName($zoneId); if ($config === null) {
return IcingaZone::loadWithAutoIncId(
$zoneId,
$this->getConnection()
)->getObjectName();
} else {
// Config has a lookup cache, is faster:
return $config->getZoneName($zoneId);
}
} }
} }
try { try {
if ($zoneId = $this->getSingleResolvedProperty('zone_id')) { if ($zoneId = $this->getSingleResolvedProperty('zone_id')) {
// Config has a lookup cache, is faster: if ($config === null) {
return $config->getZoneName($zoneId); return IcingaZone::loadWithAutoIncId(
$zoneId,
$this->getConnection()
)->getObjectName();
} else {
// Config has a lookup cache, is faster:
return $config->getZoneName($zoneId);
}
} }
} catch (Exception $e) { } catch (Exception $e) {
return self::RESOLVE_ERROR; return self::RESOLVE_ERROR;