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

ObjectsTabs: fix tabs for Choices

This commit is contained in:
Thomas Gelf 2019-04-12 11:58:09 +02:00
parent 15386ec868
commit 70618169f1
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/controllers/TemplatechoicesController.php
View File

@ -31,7 +31,7 @@ class TemplatechoicesController extends ActionController
protected function prepare($type, $title) protected function prepare($type, $title)
{ {
$this->tabs(new ObjectsTabs($type, $this->Auth()))->activate('choices'); $this->tabs(new ObjectsTabs($type, $this->Auth(), $type))->activate('choices');
$this->setAutorefreshInterval(10)->addTitle($title); $this->setAutorefreshInterval(10)->addTitle($title);
$this->actions(new ChoicesActionBar($type, $this->url())); $this->actions(new ChoicesActionBar($type, $this->url()));
ChoicesTable::create($type, $this->db())->renderTo($this); ChoicesTable::create($type, $this->db())->renderTo($this);

5
library/Director/Web/Tabs/ObjectsTabs.php
View File

@ -17,8 +17,9 @@ class ObjectsTabs extends Tabs
if ($object->isGroup()) { if ($object->isGroup()) {
$object = IcingaObject::createByType(substr($typeUrl, 0, -5)); $object = IcingaObject::createByType(substr($typeUrl, 0, -5));
} }
$shortName = $object->getShortTableName();
$plType = strtolower(preg_replace('/cys$/', 'cies', $typeUrl . 's')); $plType = strtolower(preg_replace('/cys$/', 'cies', $shortName . 's'));
if ($auth->hasPermission("director/${plType}")) { if ($auth->hasPermission("director/${plType}")) {
$this->add('index', array( $this->add('index', array(
'url' => sprintf('director/%s', $plType), 'url' => sprintf('director/%s', $plType),
@ -65,7 +66,7 @@ class ObjectsTabs extends Tabs
if ($auth->hasPermission('director/admin')) { if ($auth->hasPermission('director/admin')) {
if ($object->supportsChoices()) { if ($object->supportsChoices()) {
$this->add('choices', array( $this->add('choices', array(
'url' => sprintf('director/templatechoices/%s', $typeUrl), 'url' => sprintf('director/templatechoices/%s', $shortName),
'label' => $this->translate('Choices') 'label' => $this->translate('Choices')
)); ));
} }