tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Renamed 'alias' property to 'display_name'.

This commit is contained in:
Gunnar Beutner 2013-02-13 19:32:44 +01:00
parent c3dce7893c
commit 2118e4b490
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/icinga/host.cpp
View File

@ -52,7 +52,7 @@ Host::~Host(void)
String Host::GetDisplayName(void) const String Host::GetDisplayName(void) const
{ {
String value = Get("alias"); String value = Get("display_name");
if (!value.IsEmpty()) if (!value.IsEmpty())
return value; return value;
else else
@ -213,7 +213,7 @@ void Host::UpdateSlaveServices(void)
builder->SetType("Service"); builder->SetType("Service");
builder->SetName(name); builder->SetName(name);
builder->AddExpression("host_name", OperatorSet, GetName()); builder->AddExpression("host_name", OperatorSet, GetName());
builder->AddExpression("alias", OperatorSet, svcname); builder->AddExpression("display_name", OperatorSet, svcname);
builder->AddExpression("short_name", OperatorSet, svcname); builder->AddExpression("short_name", OperatorSet, svcname);
CopyServiceAttributes<false>(this, builder); CopyServiceAttributes<false>(this, builder);

2
lib/icinga/hostgroup.cpp
View File

@ -32,7 +32,7 @@ HostGroup::HostGroup(const Dictionary::Ptr& properties)
String HostGroup::GetDisplayName(void) const String HostGroup::GetDisplayName(void) const
{ {
String value = Get("alias"); String value = Get("display_name");
if (!value.IsEmpty()) if (!value.IsEmpty())
return value; return value;

2
lib/icinga/service.cpp
View File

@ -59,7 +59,7 @@ Service::~Service(void)
String Service::GetDisplayName(void) const String Service::GetDisplayName(void) const
{ {
String value = Get("alias"); String value = Get("display_name");
if (!value.IsEmpty()) if (!value.IsEmpty())
return value; return value;

2
lib/icinga/servicegroup.cpp
View File

@ -32,7 +32,7 @@ ServiceGroup::ServiceGroup(const Dictionary::Ptr& properties)
String ServiceGroup::GetDisplayName(void) const String ServiceGroup::GetDisplayName(void) const
{ {
String value = Get("alias"); String value = Get("display_name");
if (!value.IsEmpty()) if (!value.IsEmpty())
return value; return value;