From e04acbc55fc26e4548d7bfd25799122ce89aa615 Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Fri, 14 Oct 2016 08:33:58 +0000 Subject: [PATCH] IcingaObjectFieldLoader: do not fail on emtpy... ...parents --- .../Director/Web/Form/IcingaObjectFieldLoader.php | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/library/Director/Web/Form/IcingaObjectFieldLoader.php b/library/Director/Web/Form/IcingaObjectFieldLoader.php index cd3ce093..e8feec32 100644 --- a/library/Director/Web/Form/IcingaObjectFieldLoader.php +++ b/library/Director/Web/Form/IcingaObjectFieldLoader.php @@ -146,16 +146,17 @@ class IcingaObjectFieldLoader protected function loadDataFieldsForObjects($objectList) { - if (empty($objectList)) { - // Or should we fail? - return array(); - } - $ids = array(); $objects = array(); foreach ($objectList as $object) { - $ids[] = $object->id; - $objects[$object->id] = $object; + if ($object->hasBeenLoadedFromDb()) { + $ids[] = $object->id; + $objects[$object->id] = $object; + } + } + + if (empty($ids)) { + return array(); } $connection = $object->getConnection();