From c073278ee3a297376cc006356381e544ab6926ce Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Thu, 3 Nov 2016 12:54:15 +0100 Subject: [PATCH] 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 855b67d7..8629dd7c 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 6f82afe3..6020c288 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(