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

ObjectController: allow Service Sets in Branches

Browse Source
This commit is contained in:
Thomas Gelf 2022-09-20 12:48:26 +02:00
parent de4b890e8b
commit a684929cf5
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
library/Director/Web/Controller/ObjectController.php
View File

@ -140,13 +140,6 @@ abstract class ObjectController extends ActionController
if ($oType = $this->params->get('type', 'object')) { if ($oType = $this->params->get('type', 'object')) {
$form->setPreferredObjectType($oType); $form->setPreferredObjectType($oType);
} }
if ($this->getTableName() === 'icinga_service_set'
&& $this->showNotInBranch($this->translate('Creating Service Sets'))
) {
$this->addTitle($this->translate('Create a new Service Set'));
return;
}
if ($oType === 'template') { if ($oType === 'template') {
if ($this->showNotInBranch($this->translate('Creating Templates'))) { if ($this->showNotInBranch($this->translate('Creating Templates'))) {
$this->addTitle($this->translate('Create a new Template')); $this->addTitle($this->translate('Create a new Template'));
@ -174,7 +167,11 @@ abstract class ObjectController extends ActionController
$object = $this->requireObject(); $object = $this->requireObject();
$this->tabs()->activate('modify'); $this->tabs()->activate('modify');
$this->addObjectTitle(); $this->addObjectTitle();
if ($object->isTemplate() && $this->showNotInBranch($this->translate('Modifying Templates'))) { // Hint: Service Sets are 'templates' (as long as not being assigned to a host
if ($this->getTableName() !== 'icinga_service_set'
&& $object->isTemplate()
&& $this->showNotInBranch($this->translate('Modifying Templates'))
) {
return; return;
} }
if ($object->isApplyRule() && $this->showNotInBranch($this->translate('Modifying Apply Rules'))) { if ($object->isApplyRule() && $this->showNotInBranch($this->translate('Modifying Apply Rules'))) {