tyler.durden/icingaweb2-module-director
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2-module-director.git synced 2025-09-25 10:57:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "ServiceSet: re-enable them"

Browse Source 
This reverts commit c073278ee3a297376cc006356381e544ab6926ce.
This commit is contained in:
Thomas Gelf 2016-11-03 15:04:42 +01:00
parent 58245108c4
commit f286b5ad08
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/controllers/ServiceController.php
View File

@ -60,7 +60,7 @@ class ServiceController extends ObjectController
'urlParams' => array('name' => $this->host->object_name), 'urlParams' => array('name' => $this->host->object_name),
'label' => $this->translate('Services'), 'label' => $this->translate('Services'),
)); ));
} elseif ($this->set) { } elseif ($this->host) {
$this->getTabs()->add('services', array( $this->getTabs()->add('services', array(
'url' => 'director/serviceset/services', 'url' => 'director/serviceset/services',
'urlParams' => array('name' => $this->set->object_name), 'urlParams' => array('name' => $this->set->object_name),

2
library/Director/Web/Controller/ObjectsController.php
View File

@ -68,10 +68,12 @@ abstract class ObjectsController extends ActionController
} }
if ($object->supportsSets() || $object->isGroup() /** Bullshit, need base object, wrong on users */) { if ($object->supportsSets() || $object->isGroup() /** Bullshit, need base object, wrong on users */) {
/** forced to master, disabled for now
$tabs->add('sets', array( $tabs->add('sets', array(
'url' => sprintf('director/%ss/sets', $type), 'url' => sprintf('director/%ss/sets', $type),
'label' => $this->translate('Sets') 'label' => $this->translate('Sets')
)); ));
*/
} }
$tabs->add('tree', array( $tabs->add('tree', array(