tyler.durden/icingaweb2-module-director
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2-module-director.git synced 2025-07-31 01:34:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

IcingaObject: a couple of small fixes

Browse Source
This commit is contained in:
Thomas Gelf 2016-03-16 21:46:00 +01:00
parent 4af6b11f58
commit b188b9c18d
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
library/Director/Objects/IcingaObject.php
View File

@ -676,7 +676,13 @@ abstract class IcingaObject extends DbObject implements IcingaConfigRenderer
{
$db = $this->getDb();
$table = $this->getTableName();
$type = strtolower($this->getType());
if ($type === 'checkcommand') {
$type = 'command';
}
$query = $db->select()->from(
array('oi' => $table . '_inheritance'),
array('cnt' => 'COUNT(*)')
@ -1350,6 +1356,8 @@ abstract class IcingaObject extends DbObject implements IcingaConfigRenderer
$type = 'hostGroup';
} elseif ($type === 'usergroup') {
$type = 'userGroup';
} elseif ($type === 'timeperiod') {
$type = 'timePeriod';
} elseif ($type === 'servicegroup') {
$type = 'serviceGroup';
} elseif ($type === 'apiuser') {
@ -1472,7 +1480,7 @@ abstract class IcingaObject extends DbObject implements IcingaConfigRenderer
// TODO: Do not ship null properties based on flag?
if (!$skipDefaults || $this->differsFromDefaultValue($k, $v)) {
if ($k === 'disabled' || $this->propertyIsBoolean($k)) {
if ($k === 'disabled' || $this->propertyIsBoolean($k)) {
if ($v === 'y') {
$props[$k] = true;
} elseif ($v === 'n') {
@ -1579,11 +1587,11 @@ abstract class IcingaObject extends DbObject implements IcingaConfigRenderer
} else {
$params = array('name' => $this->object_name);
if ($this->hasProperty('host_id')) {
if ($this->hasProperty('host_id') && $this->host_id) {
$params['host'] = $this->host;
}
if ($this->hasProperty('service_id')) {
if ($this->hasProperty('service_id') && $this->service_id) {
$params['service'] = $this->service;
}
}
@ -1654,6 +1662,12 @@ abstract class IcingaObject extends DbObject implements IcingaConfigRenderer
$props[$property] = $set->getPlainUnmodifiedObject();
}
foreach ($this->loadAllMultiRelations() as $key => $rel) {
if (count($rel)) {
$props[$key] = $rel->listOriginalNames();
}
}
return (object) $props;
}