Merge pull request #562 from Icinga/fix-leaf-rule-bug

lippserd · web-flow · commit 2d70eb413c0e · 2025-04-25T15:08:04.000+02:00
Bring parent uuids in correct order
diff --git a/library/Vspheredb/Monitoring/Rule/MonitoringRulesTree.php b/library/Vspheredb/Monitoring/Rule/MonitoringRulesTree.php
@@ -88,8 +88,7 @@ public function hasConfigurationForUuid($uuid): bool
     public function getInheritedSettingsFor(BaseDbObject $object): InheritedSettings
     {
         $uuid = $object->object()->get('parent_uuid');
-        $parents = $this->listParentUuidsFor($uuid);
-        $parents[] = $uuid;
+        $parents = [$uuid, ...$this->listParentUuidsFor($uuid)];
 
         return InheritedSettings::loadForUuids($parents, $this, $this->db);
     }

Original file line number	Diff line number	Diff line change
`@@ -88,8 +88,7 @@ public function hasConfigurationForUuid($uuid): bool`
`88`	`88`	`public function getInheritedSettingsFor(BaseDbObject $object): InheritedSettings`
`89`	`89`	`{`
`90`	`90`	`$uuid = $object->object()->get('parent_uuid');`
`91`		`- $parents = $this->listParentUuidsFor($uuid);`
`92`		`- $parents[] = $uuid;`
	`91`	`+ $parents = [$uuid, ...$this->listParentUuidsFor($uuid)];`
`93`	`92`
`94`	`93`	`return InheritedSettings::loadForUuids($parents, $this, $this->db);`
`95`	`94`	`}`