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

show/activities: show diff also for create/delete 

fixes #13077
This commit is contained in:
Thomas Gelf 2016-11-08 16:21:54 +01:00
parent 72fbe80e7b
commit 8eba20a578
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
application/controllers/ShowController.php
View File

@ -97,7 +97,11 @@ class ShowController extends ActionController
$oldConfig = $this->oldConfig($entry);
$newConfig = $this->newConfig($entry);
$this->showConfigDiff($oldConfig, $newConfig);
}
protected function showConfigDiff(IcingaConfig $oldConfig, IcingaConfig $newConfig)
{
$oldFilenames = $oldConfig->getFileNames();
$newFilenames = $newConfig->getFileNames();
@ -130,14 +134,14 @@ class ShowController extends ActionController
{
$this->view->title = sprintf('%s former config', $entry->object_name);
$this->getTabs()->activate('old');
$this->showConfig($this->oldConfig($entry));
$this->showConfigDiff($this->oldConfig($entry), new IcingaConfig($this->db()));
}
protected function showNew($entry)
{
$this->view->title = sprintf('%s new config', $entry->object_name);
$this->getTabs()->activate('new');
$this->showConfig($this->newConfig($entry));
$this->showConfigDiff(new IcingaConfig($this->db()), $this->newConfig($entry));
}
protected function oldObject($entry)
@ -160,18 +164,6 @@ class ShowController extends ActionController
);
}
protected function showConfig(IcingaConfig $config)
{
$this->view->diffs = array();
foreach ($config->getFileNames() as $filename) {
$this->view->diffs[$filename] = sprintf(
'<pre>%s</pre>',
$this->view->escape($config->getFile($filename)->getContent())
);
}
return $this;
}
protected function showInfo($entry)
{
$typeName = $this->translate(