From 0bb5af811d960169a8ca755925a558caa6b2fbc7 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@icinga.com>
Date: Fri, 17 Jul 2020 14:44:35 +0200
Subject: [PATCH] Load checkable children after their groups

---
 lib/icinga/comment.ti           | 2 ++
 lib/icinga/dependency.ti        | 2 ++
 lib/icinga/downtime.ti          | 2 ++
 lib/icinga/notification.ti      | 2 ++
 lib/icinga/scheduleddowntime.ti | 2 ++
 5 files changed, 10 insertions(+)

diff --git a/lib/icinga/comment.ti b/lib/icinga/comment.ti
index 8fbb2da17..445e88271 100644
--- a/lib/icinga/comment.ti
+++ b/lib/icinga/comment.ti
@@ -32,7 +32,9 @@ public:
 class Comment : ConfigObject < CommentNameComposer
 {
 	load_after Host;
+	load_after HostGroup;
 	load_after Service;
+	load_after ServiceGroup;
 
 	[config, no_user_modify, protected, required, navigation(host)] name(Host) host_name {
 		navigate {{{
diff --git a/lib/icinga/dependency.ti b/lib/icinga/dependency.ti
index 6d6249d9f..59906fb07 100644
--- a/lib/icinga/dependency.ti
+++ b/lib/icinga/dependency.ti
@@ -23,7 +23,9 @@ class Dependency : CustomVarObject < DependencyNameComposer
 	activation_priority -10;
 
 	load_after Host;
+	load_after HostGroup;
 	load_after Service;
+	load_after ServiceGroup;
 
 	[config, no_user_modify, required, navigation(child_host)] name(Host) child_host_name {
 		navigate {{{
diff --git a/lib/icinga/downtime.ti b/lib/icinga/downtime.ti
index b1530abe1..2e0e737ef 100644
--- a/lib/icinga/downtime.ti
+++ b/lib/icinga/downtime.ti
@@ -23,7 +23,9 @@ class Downtime : ConfigObject < DowntimeNameComposer
 	activation_priority -10;
 
 	load_after Host;
+	load_after HostGroup;
 	load_after Service;
+	load_after ServiceGroup;
 
 	[config, no_user_modify, required, navigation(host)] name(Host) host_name {
 		navigate {{{
diff --git a/lib/icinga/notification.ti b/lib/icinga/notification.ti
index a8121ff6b..7e89bc2b7 100644
--- a/lib/icinga/notification.ti
+++ b/lib/icinga/notification.ti
@@ -21,7 +21,9 @@ public:
 class Notification : CustomVarObject < NotificationNameComposer
 {
 	load_after Host;
+	load_after HostGroup;
 	load_after Service;
+	load_after ServiceGroup;
 	load_after User;
 	load_after UserGroup;
 
diff --git a/lib/icinga/scheduleddowntime.ti b/lib/icinga/scheduleddowntime.ti
index c44228b1c..8cc2aa89f 100644
--- a/lib/icinga/scheduleddowntime.ti
+++ b/lib/icinga/scheduleddowntime.ti
@@ -24,7 +24,9 @@ class ScheduledDowntime : CustomVarObject < ScheduledDowntimeNameComposer
 	activation_priority 20;
 
 	load_after Host;
+	load_after HostGroup;
 	load_after Service;
+	load_after ServiceGroup;
 
 	[config, protected, no_user_modify, required, navigation(host)] name(Host) host_name {
 		navigate {{{