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

Sync: do not deal with 'disabled' for objects...

Browse Source 
...without such properties (e.g. Sets)
This commit is contained in:
Thomas Gelf 2017-10-13 11:41:59 +02:00
parent 8ec0fad185
commit 9e193dbc6b
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
library/Director/Import/Sync.php
View File

@ -594,6 +594,7 @@ class Sync
} }
} }
/** @var DbObject|IcingaObject $object */
foreach ($newObjects as $key => $object) { foreach ($newObjects as $key => $object) {
if (array_key_exists($key, $this->objects)) { if (array_key_exists($key, $this->objects)) {
switch ($this->rule->get('update_policy')) { switch ($this->rule->get('update_policy')) {
@ -605,7 +606,7 @@ class Sync
// TODO: re-evaluate merge settings. vars.x instead of // TODO: re-evaluate merge settings. vars.x instead of
// just "vars" might suffice. // just "vars" might suffice.
$this->objects[$key]->merge($object, $this->replaceVars); $this->objects[$key]->merge($object, $this->replaceVars);
if (! $hasDisabled) { if (! $hasDisabled && $object->hasProperty('disabled')) {
$this->objects[$key]->resetProperty('disabled'); $this->objects[$key]->resetProperty('disabled');
} }
break; break;