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

SyncruleController: preview improvements

This commit is contained in:
Thomas Gelf 2019-01-10 13:11:20 +01:00
parent a805b1b36b
commit f40f0f0414
1 changed files with 40 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
application/controllers/SyncruleController.php
View File

@ -2,17 +2,22 @@
namespace Icinga\Module\Director\Controllers; namespace Icinga\Module\Director\Controllers;
use dipl\Web\Widget\UnorderedList;
use Icinga\Module\Director\DirectorObject\Automation\ExportInterface;
use Icinga\Module\Director\Forms\SyncCheckForm; use Icinga\Module\Director\Forms\SyncCheckForm;
use Icinga\Module\Director\Forms\SyncPropertyForm; use Icinga\Module\Director\Forms\SyncPropertyForm;
use Icinga\Module\Director\Forms\SyncRuleForm; use Icinga\Module\Director\Forms\SyncRuleForm;
use Icinga\Module\Director\Forms\SyncRunForm; use Icinga\Module\Director\Forms\SyncRunForm;
use Icinga\Module\Director\Import\Sync; use Icinga\Module\Director\Import\Sync;
use Icinga\Module\Director\Objects\IcingaHost;
use Icinga\Module\Director\Objects\IcingaObject; use Icinga\Module\Director\Objects\IcingaObject;
use Icinga\Module\Director\Objects\IcingaService;
use Icinga\Module\Director\Web\ActionBar\AutomationObjectActionBar; use Icinga\Module\Director\Web\ActionBar\AutomationObjectActionBar;
use Icinga\Module\Director\Web\Controller\ActionController; use Icinga\Module\Director\Web\Controller\ActionController;
use Icinga\Module\Director\Objects\SyncRule; use Icinga\Module\Director\Objects\SyncRule;
use Icinga\Module\Director\Objects\SyncRun; use Icinga\Module\Director\Objects\SyncRun;
use Icinga\Module\Director\Web\Form\CloneSyncRuleForm; use Icinga\Module\Director\Web\Form\CloneSyncRuleForm;
use Icinga\Module\Director\Web\Table\IcingaServiceSetServiceTable;
use Icinga\Module\Director\Web\Table\SyncpropertyTable; use Icinga\Module\Director\Web\Table\SyncpropertyTable;
use Icinga\Module\Director\Web\Table\SyncRunTable; use Icinga\Module\Director\Web\Table\SyncRunTable;
use Icinga\Module\Director\Web\Tabs\SyncRuleTabs; use Icinga\Module\Director\Web\Tabs\SyncRuleTabs;
@ -152,6 +157,14 @@ class SyncruleController extends ActionController
$sync = new Sync($rule); $sync = new Sync($rule);
$modifications = $sync->getExpectedModifications(); $modifications = $sync->getExpectedModifications();
if (empty($modifications)) {
$this->content()->add(Html::tag('p', [
'class' => 'information'
], $this->translate('This Sync Rule is in sync and would currently not apply any changes')));
return;
}
$create = []; $create = [];
$modify = []; $modify = [];
$delete = []; $delete = [];
@ -174,11 +187,23 @@ class SyncruleController extends ActionController
if (! $object instanceof IcingaObject) { if (! $object instanceof IcingaObject) {
continue; continue;
} }
if ($object->hasModifiedGroups()) { if ($object->supportsGroups()) {
if (isset($modifiedProperties['groups'])) { if ($object->hasModifiedGroups()) {
$modifiedProperties['groups']++; if (isset($modifiedProperties['groups'])) {
} else { $modifiedProperties['groups']++;
$modifiedProperties['groups'] = 1; } else {
$modifiedProperties['groups'] = 1;
}
}
}
if ($object->supportsImports()) {
if ($object->imports()->hasBeenModified()) {
if (isset($modifiedProperties['imports'])) {
$modifiedProperties['imports']++;
} else {
$modifiedProperties['grouimportsps'] = 1;
}
} }
} }
if ($object->supportsCustomVars()) { if ($object->supportsCustomVars()) {
@ -274,17 +299,23 @@ class SyncruleController extends ActionController
protected function listModifiedProperties($properties) protected function listModifiedProperties($properties)
{ {
$parts = []; $list = new UnorderedList();
foreach ($properties as $property => $cnt) { foreach ($properties as $property => $cnt) {
$parts[] = "${cnt}x $property"; $list->addItem("${cnt}x $property");
} }
return implode(', ', $parts); return $list;
} }
protected function getObjectNameString($object) protected function getObjectNameString($object)
{ {
if ($object instanceof IcingaObject) { if ($object instanceof ExportInterface && (
$object instanceof IcingaService || (
$object instanceof IcingaObject && $object->isTemplate()
)
)) {
return $object->getUniqueIdentifier();
} elseif ($object instanceof IcingaObject) {
return $object->getObjectName(); return $object->getObjectName();
} else { } else {
/** @var \Icinga\Module\Director\Data\Db\DbObject $object */ /** @var \Icinga\Module\Director\Data\Db\DbObject $object */