[icinga-checkins] icinga.org: icingaweb2-module-director/master: ServiceSet: re-enable them

git at icinga.org git at icinga.org
Thu Nov 3 13:36:34 CET 2016


Module: icingaweb2-module-director
Branch: master
Commit: c073278ee3a297376cc006356381e544ab6926ce
URL:    https://git.icinga.org/?p=icingaweb2-module-director.git;a=commit;h=c073278ee3a297376cc006356381e544ab6926ce

Author: Thomas Gelf <thomas at gelf.net>
Date:   Thu Nov  3 12:54:15 2016 +0100

ServiceSet: re-enable them

---

 application/controllers/ServiceController.php         |    2 +-
 library/Director/Web/Controller/ObjectsController.php |    2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/application/controllers/ServiceController.php b/application/controllers/ServiceController.php
index 855b67d..8629dd7 100644
--- a/application/controllers/ServiceController.php
+++ b/application/controllers/ServiceController.php
@@ -60,7 +60,7 @@ class ServiceController extends ObjectController
                 'urlParams' => array('name' => $this->host->object_name),
                 'label'     => $this->translate('Services'),
             ));
-        } elseif ($this->host) {
+        } elseif ($this->set) {
             $this->getTabs()->add('services', array(
                 'url'       => 'director/serviceset/services',
                 'urlParams' => array('name' => $this->set->object_name),
diff --git a/library/Director/Web/Controller/ObjectsController.php b/library/Director/Web/Controller/ObjectsController.php
index 6f82afe..6020c28 100644
--- a/library/Director/Web/Controller/ObjectsController.php
+++ b/library/Director/Web/Controller/ObjectsController.php
@@ -68,12 +68,10 @@ abstract class ObjectsController extends ActionController
         }
 
         if ($object->supportsSets() || $object->isGroup() /** Bullshit, need base object, wrong on users */) {
-            /** forced to master, disabled for now
             $tabs->add('sets', array(
                 'url'       => sprintf('director/%ss/sets', $type),
                 'label'     => $this->translate('Sets')
             ));
-            */
         }
 
         $tabs->add('tree', array(



More information about the icinga-checkins mailing list