tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/remove-large-add-to-menu-tab-11850' 

fixes #11850
This commit is contained in:
Eric Lippmann 2016-06-02 17:54:55 +02:00
parent e92aa3de42 ecfc8b0f0a
commit 97451dae86
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/Icinga/Web/Widget/Tabs.php
View File

@ -249,7 +249,7 @@ EOT;
if ($this->has($name)) {
unset($this->tabs[$name]);
if (($dropdownIndex = array_search($name, $this->dropdownTabs, true)) !== false) {
array_splice($this->dropdownTabs, $dropdownIndex, 2);
array_splice($this->dropdownTabs, $dropdownIndex, 1);
}
}

1
modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
View File

@ -129,6 +129,7 @@ abstract class MonitoredObjectController extends Controller
$this->view->form = $form;
$this->view->object = $this->object;
$this->view->tabs->remove('dashboard');
$this->view->tabs->remove('menu-entry');
$this->_helper->viewRenderer('partials/command/object-command-form', null, true);
return $form;
}