tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-30 09:14:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/move-monitoring-menu-renderers-7642'

Browse Source 
fixes #7642
This commit is contained in:
Alexander Fuhr 2015-04-20 13:22:55 +02:00
commit e812bed241
6 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
library/Icinga/Web/Menu.php
View File

@ -117,13 +117,18 @@ class Menu implements RecursiveIterator
foreach ($props as $key => $value) { foreach ($props as $key => $value) {
$method = 'set' . implode('', array_map('ucfirst', explode('_', strtolower($key)))); $method = 'set' . implode('', array_map('ucfirst', explode('_', strtolower($key))));
if ($key === 'renderer') { if ($key === 'renderer') {
$class = '\Icinga\Web\Menu\\' . $value; $value = '\\' . ltrim($value, '\\');
if (!class_exists($class)) { if (class_exists($value)) {
throw new ConfigurationError( $value = new $value;
sprintf('ItemRenderer with class "%s" does not exist', $class) } else {
); $class = '\Icinga\Web\Menu' . $value;
if (!class_exists($class)) {
throw new ConfigurationError(
sprintf('ItemRenderer with class "%s" does not exist', $class)
);
}
$value = new $class;
} }
$value = new $class;
} }
if (method_exists($this, $method)) { if (method_exists($this, $method)) {
$this->{$method}($value); $this->{$method}($value);

6
modules/monitoring/configuration.php
View File

@ -94,17 +94,17 @@ $this->provideSearchUrl($this->translate('Servicegroups'), 'monitoring/list/serv
* Problems Section * Problems Section
*/ */
$section = $this->menuSection($this->translate('Problems'), array( $section = $this->menuSection($this->translate('Problems'), array(
'renderer' => 'ProblemMenuItemRenderer', 'renderer' => 'Icinga\Module\Monitoring\Web\Menu\ProblemMenuItemRenderer',
'icon' => 'block', 'icon' => 'block',
'priority' => 20 'priority' => 20
)); ));
$section->add($this->translate('Unhandled Hosts'), array( $section->add($this->translate('Unhandled Hosts'), array(
'renderer' => 'UnhandledHostMenuItemRenderer', 'renderer' => 'Icinga\Module\Monitoring\Web\Menu\UnhandledHostMenuItemRenderer',
'url' => 'monitoring/list/hosts?host_problem=1&host_handled=0', 'url' => 'monitoring/list/hosts?host_problem=1&host_handled=0',
'priority' => 30 'priority' => 30
)); ));
$section->add($this->translate('Unhandled Services'), array( $section->add($this->translate('Unhandled Services'), array(
'renderer' => 'UnhandledServiceMenuItemRenderer', 'renderer' => 'Icinga\Module\Monitoring\Web\Menu\UnhandledServiceMenuItemRenderer',
'url' => 'monitoring/list/services?service_problem=1&service_handled=0&sort=service_severity', 'url' => 'monitoring/list/services?service_problem=1&service_handled=0&sort=service_severity',
'priority' => 40 'priority' => 40
)); ));

5
library/Icinga/Web/Menu/MonitoringMenuItemRenderer.php → modules/monitoring/library/Monitoring/Web/Menu/MonitoringMenuItemRenderer.php
View File

@ -1,10 +1,11 @@
<?php <?php
/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */ /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
namespace Icinga\Web\Menu; namespace Icinga\Module\Monitoring\Web\Menu;
use Icinga\Web\Menu as Menu;
use Icinga\Module\Monitoring\Backend\MonitoringBackend; use Icinga\Module\Monitoring\Backend\MonitoringBackend;
use Icinga\Web\Menu; use Icinga\Web\Menu\MenuItemRenderer;
use Icinga\Web\Url; use Icinga\Web\Url;
class MonitoringMenuItemRenderer implements MenuItemRenderer { class MonitoringMenuItemRenderer implements MenuItemRenderer {

2
library/Icinga/Web/Menu/ProblemMenuItemRenderer.php → modules/monitoring/library/Monitoring/Web/Menu/ProblemMenuItemRenderer.php
View File

@ -1,7 +1,7 @@
<?php <?php
/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */ /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
namespace Icinga\Web\Menu; namespace Icinga\Module\Monitoring\Web\Menu;
class ProblemMenuItemRenderer extends MonitoringMenuItemRenderer class ProblemMenuItemRenderer extends MonitoringMenuItemRenderer
{ {

4
library/Icinga/Web/Menu/UnhandledHostMenuItemRenderer.php → modules/monitoring/library/Monitoring/Web/Menu/UnhandledHostMenuItemRenderer.php
View File

@ -1,9 +1,7 @@
<?php <?php
/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */ /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
namespace Icinga\Web\Menu; namespace Icinga\Module\Monitoring\Web\Menu;
use Icinga\Web\Menu;
class UnhandledHostMenuItemRenderer extends MonitoringMenuItemRenderer class UnhandledHostMenuItemRenderer extends MonitoringMenuItemRenderer
{ {

4
library/Icinga/Web/Menu/UnhandledServiceMenuItemRenderer.php → modules/monitoring/library/Monitoring/Web/Menu/UnhandledServiceMenuItemRenderer.php
View File

@ -1,9 +1,7 @@
<?php <?php
/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */ /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
namespace Icinga\Web\Menu; namespace Icinga\Module\Monitoring\Web\Menu;
use Icinga\Web\Menu;
class UnhandledServiceMenuItemRenderer extends MonitoringMenuItemRenderer class UnhandledServiceMenuItemRenderer extends MonitoringMenuItemRenderer
{ {