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

ActivityLog: Show proper diffs for service of sets

Browse Source 
fixes #1287
This commit is contained in:
Markus Frosch 2019-03-28 17:16:28 +01:00
parent 7b9e9f3a2f
commit cd9d93de3e
1 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
library/Director/Web/Widget/ActivityLogInfo.php
View File

@ -417,13 +417,38 @@ class ActivityLogInfo extends HtmlDocument
);
}
protected function objectToConfig(IcingaObject $object)
{
if ($object instanceof IcingaService) {
return $this->previewService($object);
} else {
return $object->toSingleIcingaConfig();
}
}
protected function previewService(IcingaService $service)
{
if (($set = $service->get('service_set')) !== null) {
// simulate rendering of service in set
$set = IcingaServiceSet::load($set, $this->db);
$service->set('service_set_id', null);
if (($assign = $set->get('assign_filter')) !== null) {
$service->set('object_type', 'apply');
$service->set('assign_filter', $assign);
}
}
return $service->toSingleIcingaConfig();
}
/**
* @return IcingaConfig
* @throws \Icinga\Exception\IcingaException
*/
protected function newConfig()
{
return $this->newObject()->toSingleIcingaConfig();
return $this->objectToConfig($this->newObject());
}
/**
@ -432,7 +457,7 @@ class ActivityLogInfo extends HtmlDocument
*/
protected function oldConfig()
{
return $this->oldObject()->toSingleIcingaConfig();
return $this->objectToConfig($this->oldObject());
}
protected function getLinkToObject()