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

ObjectsController: get rid of templates action

This commit is contained in:
Thomas Gelf 2015-12-16 14:31:29 +01:00
parent 9b2fde48e8
commit ff855703df
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
application/views/scripts/hosttemplates/tree.phtml → application/views/scripts/objects/tree.phtml
View File

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

@ -47,10 +47,6 @@ abstract class ObjectsController extends ActionController
'url' => sprintf('director/%ss', strtolower($type)), 'url' => sprintf('director/%ss', strtolower($type)),
'label' => $this->translate(ucfirst($type) . 's'), 'label' => $this->translate(ucfirst($type) . 's'),
)); ));
$tabs = $this->getTabs()->add('objecttemplates', array(
'url' => sprintf('director/%stemplates', strtolower($type)),
'label' => $this->translate('Templates'),
));
if ($object->supportsGroups() || $object->isGroup()) { if ($object->supportsGroups() || $object->isGroup()) {
$tabs->add('objectgroups', array( $tabs->add('objectgroups', array(
'url' => sprintf('director/%sgroups', $type), 'url' => sprintf('director/%sgroups', $type),
@ -59,7 +55,7 @@ abstract class ObjectsController extends ActionController
} }
$tabs->add('tree', array( $tabs->add('tree', array(
'url' => sprintf('director/%stemplates/tree', $type), 'url' => sprintf('director/%ss/templatetree', $type),
'label' => $this->translate('Tree'), 'label' => $this->translate('Tree'),
)); ));
} }
@ -75,11 +71,6 @@ abstract class ObjectsController extends ActionController
if ($dummy->isGroup()) { if ($dummy->isGroup()) {
$this->getTabs()->activate('objectgroups'); $this->getTabs()->activate('objectgroups');
$table = 'icinga' . ucfirst($type); $table = 'icinga' . ucfirst($type);
} elseif ($dummy->isTemplate()) {
$this->getTabs()->activate('objecttemplates');
$table = 'icinga' . ucfirst($type);
$this->loadTable($table);
$table = 'icinga' . ucfirst($type) . 'Template';
} else { } else {
$this->getTabs()->activate('objects'); $this->getTabs()->activate('objects');
$table = 'icinga' . ucfirst($type); $table = 'icinga' . ucfirst($type);
@ -109,12 +100,12 @@ abstract class ObjectsController extends ActionController
$this->render('objects/table', null, true); $this->render('objects/table', null, true);
} }
public function treeAction() public function templatetreeAction()
{ {
$this->getTabs()->activate('tree'); $this->getTabs()->activate('tree');
$this->view->tree = $this->db()->fetchTemplateTree(strtolower($this->getType())); $this->view->tree = $this->db()->fetchTemplateTree(strtolower($this->getType()));
$this->view->objectTypeName = $this->getType(); $this->view->objectTypeName = $this->getType();
$this->render('hosttemplates/tree', null, true); $this->render('objects/tree', null, true);
} }
protected function dummyObject() protected function dummyObject()