tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-23 22:04:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix exception when navigating to the preferences after namespacing all controllers

Browse Source
This commit is contained in:
Eric Lippmann 2015-08-31 10:19:30 +02:00
parent 4e2595c09b
commit 4fb6856caf
1 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
library/Icinga/Web/Controller/ControllerTabCollector.php
View File

@ -8,26 +8,24 @@ use Icinga\Application\Icinga;
use Icinga\Web\Widget\Tabs; use Icinga\Web\Widget\Tabs;
/** /**
* Static helper class that collects tabs provided by the 'createProvidedTabs' method * Static helper class that collects tabs provided by the 'createProvidedTabs' method of controllers
* of controllers.
*/ */
class ControllerTabCollector class ControllerTabCollector
{ {
/** /**
* Scan all controllers with the provided name * Scan all controllers with given name in the application and (loaded) module folders and collects their provided
* in the application and (loaded) module folders and collects their provided tabs * tabs
* *
* @param string $controller The name of the controllers to use for tab collection * @param string $controllerName The name of the controllers to use for tab collection
* *
* @return Tabs A @see Tabs instance containing the application tabs first * @return Tabs A {@link Tabs} instance containing the application tabs first followed by the
* followed by the tabs provided from the modules * tabs provided from the modules
*/ */
public static function collectControllerTabs($controller) public static function collectControllerTabs($controllerName)
{ {
require_once(Icinga::app()->getApplicationDir('/controllers/'.$controller.'.php')); $controller = '\Icinga\\' . Dispatcher::CONTROLLER_NAMESPACE . '\\' . $controllerName;
$applicationTabs = $controller::createProvidedTabs(); $applicationTabs = $controller::createProvidedTabs();
$moduleTabs = self::collectModuleTabs($controller); $moduleTabs = self::collectModuleTabs($controllerName);
$tabs = new Tabs(); $tabs = new Tabs();
foreach ($applicationTabs as $name => $tab) { foreach ($applicationTabs as $name => $tab) {
@ -35,7 +33,7 @@ class ControllerTabCollector
} }
foreach ($moduleTabs as $name => $tab) { foreach ($moduleTabs as $name => $tab) {
// don't overwrite application tabs if the module wants to // Don't overwrite application tabs if the module wants to
if ($tabs->has($name)) { if ($tabs->has($name)) {
continue; continue;
} }
@ -66,29 +64,30 @@ class ControllerTabCollector
/** /**
* Collects the tabs from the createProvidedTabs() method in the configuration controller * Collects the tabs from the createProvidedTabs() method in the configuration controller
* *
* If the module doesn't have the given controller or createProvidedTabs method in the controller * If the module doesn't have the given controller or createProvidedTabs method in the controller an empty array
* an empty array will be returned * will be returned
* *
* @param string $controller The name of the controller that provides tabs via createProvidedTabs * @param string $controllerName The name of the controller that provides tabs via createProvidedTabs
* @param Module $module The module instance that provides the controller * @param Module $module The module instance that provides the controller
* *
* @return array * @return array
*/ */
private static function createModuleConfigurationTabs($controller, Module $module) private static function createModuleConfigurationTabs($controllerName, Module $module)
{ {
// TODO(el): Only works for controllers w/o namepsace: https://dev.icinga.org/issues/4149
$controllerDir = $module->getControllerDir(); $controllerDir = $module->getControllerDir();
$name = $module->getName(); $name = $module->getName();
$controllerDir = $controllerDir . '/' . $controller . '.php'; $controllerDir = $controllerDir . '/' . $controllerName . '.php';
$controllerName = ucfirst($name) . '_' . $controller; $controllerName = ucfirst($name) . '_' . $controllerName;
if (is_readable($controllerDir)) { if (is_readable($controllerDir)) {
require_once(realpath($controllerDir)); require_once(realpath($controllerDir));
if (!method_exists($controllerName, "createProvidedTabs")) { if (! method_exists($controllerName, 'createProvidedTabs')) {
return array(); return array();
} }
$tab = $controllerName::createProvidedTabs(); $tab = $controllerName::createProvidedTabs();
if (!is_array($tab)) { if (! is_array($tab)) {
$tab = array($name => $tab); $tab = array($name => $tab);
} }
return $tab; return $tab;