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

IcingaObject: fix key handling for unresolved props

Browse Source
This commit is contained in:
Thomas Gelf 2016-03-07 18:10:09 +01:00
parent b3a44bd7dd
commit f2d9e1a544
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -186,13 +186,14 @@ abstract class IcingaObject extends DbObject implements IcingaConfigRenderer
protected function resolveUnresolvedRelatedProperty($name) protected function resolveUnresolvedRelatedProperty($name)
{ {
$class = $this->getRelationClass($name); $short = substr($name, 0, -3);
$class = $this->getRelationClass($short);
$object = $class::load( $object = $class::load(
$this->unresolvedRelatedProperties[$name], $this->unresolvedRelatedProperties[$name],
$this->connection $this->connection
); );
$this->$key = $object->id; $this->$name = $object->id;
unset($this->unresolvedRelatedProperties[$name]); unset($this->unresolvedRelatedProperties[$name]);
} }
@ -235,8 +236,8 @@ abstract class IcingaObject extends DbObject implements IcingaConfigRenderer
if (substr($key, -3) === '_id') { if (substr($key, -3) === '_id') {
$short = substr($key, 0, -3); $short = substr($key, 0, -3);
if ($this->hasRelation($short)) { if ($this->hasRelation($short)) {
if (array_key_exists($short, $this->unresolvedRelatedProperties)) { if (array_key_exists($key, $this->unresolvedRelatedProperties)) {
$this->resolveUnresolvedRelatedProperty($short); $this->resolveUnresolvedRelatedProperty($key);
} }
} }
} }