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

ServiceController: avoid loop detection error... 

...for fake services generated with the `use_var_overrides` property

fixes #820
This commit is contained in:
Thomas Gelf 2017-02-27 18:55:09 +01:00
parent fd53224a58
commit 8f8c8bf841
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
application/controllers/ServiceController.php
View File

@ -11,6 +11,7 @@ use Icinga\Module\Director\Objects\IcingaHost;
class ServiceController extends ObjectController
{
/** @var IcingaHost */
protected $host;
protected $set;
@ -112,6 +113,9 @@ class ServiceController extends ObjectController
public function editAction()
{
$this->getTabs()->activate('modify');
/** @var IcingaService $object */
$object = $this->object;
if ($this->host) {
@ -123,24 +127,25 @@ class ServiceController extends ObjectController
);
}
$this->view->form = $form = $this
->loadForm('icingaService')
->setDb($this->db());
if ($this->host && $object->usesVarOverrides()) {
$parent = IcingaService::create(array(
'object_type' => 'template',
// TODO: => 'myself', -> There is no such import: "myself"
$fake = IcingaService::create(array(
'object_type' => 'object',
'host_id' => $object->get('host_id'),
'imports' => $object,
'object_name' => $object->object_name,
'vars' => $object->vars,
'use_var_overrides' => 'y',
'vars' => $this->host->getOverriddenServiceVars($object->object_name),
), $this->db());
$object->vars = $this->host->getOverriddenServiceVars($object->object_name);
$object->imports()->add($parent);
$form->setObject($fake);
} else {
$form->setObject($object);
}
$this->getTabs()->activate('modify');
$this->view->form = $form = $this->loadForm('icingaService')
->setDb($this->db())
->setObject($object);
$this->view->form->handleRequest();
$this->view->actionLinks .= $this->createCloneLink();