Merge branch 'feature/property-fix-4973' into next

Fixes #4973

lib/icinga/host.ti

@@ -32,7 +32,12 @@ enum StateType
 class Host : DynamicObject
 {
 	[config] String display_name {
-		default {{{ return GetName(); }}}
+		get {{{
+			if (m_DisplayName.IsEmpty())
+				return GetName();
+			else
+				return m_DisplayName;
+		}}}
 	};
 	[config] Array::Ptr groups;
 	[config] Dictionary::Ptr macros;

lib/icinga/hostgroup.ti

@@ -6,7 +6,12 @@ namespace icinga
 class HostGroup : DynamicObject
 {
 	[config] String display_name {
-		default {{{ return GetName(); }}}
+		get {{{
+			if (m_DisplayName.IsEmpty())
+				return GetName();
+			else
+				return m_DisplayName;
+		}}}
 	};
 };
 

lib/icinga/service.ti

@@ -48,7 +48,12 @@ class Service : DynamicObject
 	[config] String event_command (EventCommandRaw);
 	[config] bool volatile;
 	[config] String short_name {
-		default {{{ return GetName(); }}}
+		get {{{
+			if (m_ShortName.IsEmpty())
+				return GetName();
+			else
+				return m_ShortName;
+		}}}
 	};
 	[config] String host (HostRaw);
 	[config] double flapping_threshold {

lib/icinga/servicegroup.ti

@@ -6,7 +6,12 @@ namespace icinga
 class ServiceGroup : DynamicObject
 {
 	[config] String display_name {
-		default {{{ return GetName(); }}}
+		get {{{
+			if (m_DisplayName.IsEmpty())
+				return GetName();
+			else
+				return m_DisplayName;
+		}}}
 	};
 };
 

lib/icinga/timeperiod.ti

@@ -6,7 +6,12 @@ namespace icinga
 class TimePeriod : DynamicObject
 {
 	[config] String display_name {
-		default {{{ return GetName(); }}}
+		get {{{
+			if (m_DisplayName.IsEmpty())
+				return GetName();
+			else
+				return m_DisplayName;
+		}}}
 	};
 	[config] Dictionary::Ptr ranges;
 	[state] Value valid_begin;

lib/icinga/user.ti

@@ -6,7 +6,12 @@ namespace icinga
 class User : DynamicObject
 {
 	[config] String display_name {
-		default {{{ return GetName(); }}}
+		get {{{
+			if (m_DisplayName.IsEmpty())
+				return GetName();
+			else
+				return m_DisplayName;
+		}}}
 	};
 	[config] Dictionary::Ptr macros;
 	[config] Array::Ptr groups;

lib/icinga/usergroup.ti

@@ -6,7 +6,12 @@ namespace icinga
 class UserGroup : DynamicObject
 {
 	[config] String display_name {
-		default {{{ return GetName(); }}}
+		get {{{
+			if (m_DisplayName.IsEmpty())
+				return GetName();
+			else
+				return m_DisplayName;
+		}}}
 	};
 };