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

IcingaObject: blacklist "disabled" when inheriting

This commit is contained in:
Thomas Gelf 2016-02-28 14:28:27 +01:00
parent 8bcbf0f45a
commit 7d9fefd61f
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -497,7 +497,7 @@ abstract class IcingaObject extends DbObject implements IcingaConfigRenderer
$getInherited = 'getInherited' . $what;
$getOrigins = 'getOrigins' . $what;
$blacklist = array('id', 'object_type', 'object_name');
$blacklist = array('id', 'object_type', 'object_name', 'disabled');
foreach ($objects as $name => $object) {
$origins = $object->$getOrigins();
@ -512,8 +512,13 @@ abstract class IcingaObject extends DbObject implements IcingaConfigRenderer
}
foreach ($object->$get() as $key => $value) {
if ($value === null) continue;
if (in_array($key, $blacklist)) continue;
// TODO: skip if default value?
if ($value === null) {
continue;
}
if (in_array($key, $blacklist)) {
continue;
}
$vals['_MERGED_']->$key = $value;
$vals['_INHERITED_']->$key = $value;
$vals['_ORIGINS_']->$key = $name;