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

Sync: fix datalist entry sync

Browse Source
This commit is contained in:
Thomas Gelf 2016-02-09 19:21:36 +01:00
parent ef1079e600
commit ad39da9a13
1 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -277,9 +277,28 @@ class Sync
$objects = IcingaObject::loadAllByType($rule->object_type, $db); $objects = IcingaObject::loadAllByType($rule->object_type, $db);
if ($rule->object_type === 'datalistEntry') { if ($rule->object_type === 'datalistEntry') {
$listId = null;
foreach ($properties as $prop) {
if ($prop->destination_field === 'list_id') {
$listId = (int) $prop->source_expression;
}
}
if ($listId === null) {
throw new IcingaException(
'Cannot sync datalist entry without list_ist'
);
}
$no = array(); $no = array();
foreach ($objects as $o) { foreach ($objects as $k => $o) {
// if ($o->list_id !== $source-> if ($o->list_id !== $listId) {
$no[] = $k;
}
}
foreach ($no as $k) {
unset($objects[$k]);
} }
} }
$objectKey = $rule->object_type === 'datalistEntry' ? 'entry_name' : 'object_name'; $objectKey = $rule->object_type === 'datalistEntry' ? 'entry_name' : 'object_name';
@ -447,7 +466,9 @@ class Sync
} }
continue; continue;
} }
if ($object->shouldBeRemoved()) {
// TODO: introduce DirectorObject with shouldBeRemoved
if ($object instanceof IcingaObject && $object->shouldBeRemoved()) {
$object->delete($db); $object->delete($db);
continue; continue;
} }