mirror of
https://github.com/Icinga/icingadb-web.git
synced 2026-06-04 14:22:23 -04:00
Merge pull request #427 from Icinga/problems-badge-null
Don't fail if the problems badge is null
This commit is contained in:
Johannes Meyer
GitHub
commit
b6ef83c1cf
2 changed files with 65 additions and 73 deletions
|
|
@ -2,14 +2,12 @@
|
|||
|
||||
/* Icinga DB Web | (c) 2020 Icinga GmbH | GPLv2 */
|
||||
|
||||
namespace Icinga\Module\Icingadb
|
||||
{
|
||||
use Exception;
|
||||
namespace Icinga\Module\Icingadb {
|
||||
|
||||
use Icinga\Authentication\Auth;
|
||||
use Icinga\Module\Icingadb\Web\Navigation\Renderer\HostProblemsBadge;
|
||||
use Icinga\Module\Icingadb\Web\Navigation\Renderer\ServiceProblemsBadge;
|
||||
use Icinga\Util\StringHelper;
|
||||
use ipl\Web\Widget\Icon;
|
||||
use RecursiveDirectoryIterator;
|
||||
use RecursiveIteratorIterator;
|
||||
|
||||
|
|
@ -276,20 +274,20 @@ namespace Icinga\Module\Icingadb
|
|||
'priority' => 20
|
||||
]);
|
||||
$problemSection->add(N_('Host Problems'), [
|
||||
'renderer' => (new HostProblemsBadge())->disableLink(),
|
||||
'renderer' => (new HostProblemsBadge())->disableLink(),
|
||||
'icon' => 'server',
|
||||
'description' => $this->translate('List current host problems'),
|
||||
'url' => 'icingadb/hosts?host.state.is_problem=y'
|
||||
'url' => 'icingadb/hosts?host.state.is_problem=y'
|
||||
. '&sort=host.state.severity desc',
|
||||
'priority' => 50
|
||||
'priority' => 50
|
||||
]);
|
||||
$problemSection->add(N_('Service Problems'), [
|
||||
'renderer' => (new ServiceProblemsBadge())->disableLink(),
|
||||
'renderer' => (new ServiceProblemsBadge())->disableLink(),
|
||||
'icon' => 'cog',
|
||||
'description' => $this->translate('List current service problems'),
|
||||
'url' => 'icingadb/services?service.state.is_problem=y'
|
||||
'url' => 'icingadb/services?service.state.is_problem=y'
|
||||
. '&sort=service.state.severity desc',
|
||||
'priority' => 60
|
||||
'priority' => 60
|
||||
]);
|
||||
$problemSection->add(N_('Service Grid'), [
|
||||
'icon' => 'cogs',
|
||||
|
|
@ -300,9 +298,9 @@ namespace Icinga\Module\Icingadb
|
|||
|
||||
$problemSection->add(N_('Current Downtimes'), [
|
||||
'description' => $this->translate('List current downtimes'),
|
||||
'url' => 'icingadb/downtimes?downtime.is_in_effect=y',
|
||||
'priority' => 80,
|
||||
'icon' => 'plug'
|
||||
'url' => 'icingadb/downtimes?downtime.is_in_effect=y',
|
||||
'priority' => 80,
|
||||
'icon' => 'plug'
|
||||
]);
|
||||
|
||||
/**
|
||||
|
|
@ -311,27 +309,27 @@ namespace Icinga\Module\Icingadb
|
|||
* Overview section in case monitoring is disabled
|
||||
*/
|
||||
$overviewSection = $this->menuSection('Overview', [
|
||||
'icon' => 'binoculars',
|
||||
'priority' => 30
|
||||
'icon' => 'binoculars',
|
||||
'priority' => 30
|
||||
]);
|
||||
|
||||
$overviewSection->add(N_('Tactical Overview'), [
|
||||
'url' => 'icingadb/tactical',
|
||||
'url' => 'icingadb/tactical',
|
||||
'description' => $this->translate('Open tactical overview'),
|
||||
'priority' => 40,
|
||||
'icon' => 'chart-pie'
|
||||
'priority' => 40,
|
||||
'icon' => 'chart-pie'
|
||||
]);
|
||||
$overviewSection->add(N_('Hosts'), [
|
||||
'priority' => 50,
|
||||
'priority' => 50,
|
||||
'description' => $this->translate('List hosts'),
|
||||
'url' => 'icingadb/hosts',
|
||||
'icon' => 'server'
|
||||
'url' => 'icingadb/hosts',
|
||||
'icon' => 'server'
|
||||
]);
|
||||
$overviewSection->add(N_('Services'), [
|
||||
'priority' => 50,
|
||||
'priority' => 50,
|
||||
'description' => $this->translate('List services'),
|
||||
'url' => 'icingadb/services',
|
||||
'icon' => 'cog'
|
||||
'url' => 'icingadb/services',
|
||||
'icon' => 'cog'
|
||||
]);
|
||||
$auth = Auth::getInstance();
|
||||
$routeBlacklist = [];
|
||||
|
|
@ -345,50 +343,50 @@ namespace Icinga\Module\Icingadb
|
|||
if (! array_key_exists('servicegroups', $routeBlacklist)) {
|
||||
$overviewSection->add(N_('Service Groups'), [
|
||||
'description' => $this->translate('List service groups'),
|
||||
'url' => 'icingadb/servicegroups',
|
||||
'priority' => 60,
|
||||
'icon' => 'cogs'
|
||||
'url' => 'icingadb/servicegroups',
|
||||
'priority' => 60,
|
||||
'icon' => 'cogs'
|
||||
]);
|
||||
}
|
||||
|
||||
if (! array_key_exists('hostgroups', $routeBlacklist)) {
|
||||
$overviewSection->add(N_('Host Groups'), [
|
||||
'description' => $this->translate('List host groups'),
|
||||
'url' => 'icingadb/hostgroups',
|
||||
'priority' => 60,
|
||||
'icon' => 'network-wired'
|
||||
'url' => 'icingadb/hostgroups',
|
||||
'priority' => 60,
|
||||
'icon' => 'network-wired'
|
||||
]);
|
||||
}
|
||||
|
||||
if (! array_key_exists('users', $routeBlacklist)) {
|
||||
$overviewSection->add(N_('Contacts'), [
|
||||
'description' => $this->translate('List contacts'),
|
||||
'url' => 'icingadb/users',
|
||||
'priority' => 70,
|
||||
'icon' => 'user-friends'
|
||||
'url' => 'icingadb/users',
|
||||
'priority' => 70,
|
||||
'icon' => 'user-friends'
|
||||
]);
|
||||
}
|
||||
|
||||
if (! array_key_exists('usergroups', $routeBlacklist)) {
|
||||
$overviewSection->add(N_('Contactgroups'), [
|
||||
'description' => $this->translate('List users'),
|
||||
'url' => 'icingadb/usergroups',
|
||||
'priority' => 70,
|
||||
'icon' => 'users'
|
||||
'url' => 'icingadb/usergroups',
|
||||
'priority' => 70,
|
||||
'icon' => 'users'
|
||||
]);
|
||||
}
|
||||
|
||||
$overviewSection->add(N_('Comments'), [
|
||||
'url' => 'icingadb/comments',
|
||||
'url' => 'icingadb/comments',
|
||||
'description' => $this->translate('List comments'),
|
||||
'priority' => 80,
|
||||
'icon' => 'comments'
|
||||
'priority' => 80,
|
||||
'icon' => 'comments'
|
||||
]);
|
||||
$overviewSection->add(N_('Downtimes'), [
|
||||
'url' => 'icingadb/downtimes',
|
||||
'url' => 'icingadb/downtimes',
|
||||
'description' => $this->translate('List downtimes'),
|
||||
'priority' => 80,
|
||||
'icon' => 'plug'
|
||||
'priority' => 80,
|
||||
'icon' => 'plug'
|
||||
]);
|
||||
|
||||
/**
|
||||
|
|
@ -398,8 +396,8 @@ namespace Icinga\Module\Icingadb
|
|||
*/
|
||||
|
||||
$section = $this->menuSection(N_('History'), array(
|
||||
'icon' => 'history',
|
||||
'priority' => 90
|
||||
'icon' => 'history',
|
||||
'priority' => 90
|
||||
));
|
||||
|
||||
$section->add(N_('Event Overview'), array(
|
||||
|
|
@ -446,17 +444,17 @@ namespace Icinga\Module\Icingadb
|
|||
'icon' => 'cog'
|
||||
]);
|
||||
$section->add(N_('Downtimes'), [
|
||||
'url' => 'icingadb/downtimes',
|
||||
'url' => 'icingadb/downtimes',
|
||||
'priority' => 30,
|
||||
'icon' => 'plug'
|
||||
]);
|
||||
$section->add(N_('Comments'), [
|
||||
'url' => 'icingadb/comments',
|
||||
'url' => 'icingadb/comments',
|
||||
'priority' => 40,
|
||||
'icon' => 'comments'
|
||||
]);
|
||||
$section->add(N_('Notifications'), [
|
||||
'url' => 'icingadb/notifications',
|
||||
'url' => 'icingadb/notifications',
|
||||
'priority' => 50,
|
||||
'icon' => 'bell'
|
||||
]);
|
||||
|
|
@ -478,7 +476,7 @@ namespace Icinga\Module\Icingadb
|
|||
|
||||
if (! array_key_exists('users', $routeBlacklist)) {
|
||||
$section->add(N_('Users'), [
|
||||
'url' => 'icingadb/users',
|
||||
'url' => 'icingadb/users',
|
||||
'priority' => 60,
|
||||
'icon' => 'user-friends'
|
||||
]);
|
||||
|
|
@ -486,7 +484,7 @@ namespace Icinga\Module\Icingadb
|
|||
|
||||
if (! array_key_exists('usergroups', $routeBlacklist)) {
|
||||
$section->add(N_('User Groups'), [
|
||||
'url' => 'icingadb/usergroups',
|
||||
'url' => 'icingadb/usergroups',
|
||||
'priority' => 70,
|
||||
'icon' => 'users'
|
||||
]);
|
||||
|
|
@ -494,7 +492,7 @@ namespace Icinga\Module\Icingadb
|
|||
|
||||
if (! array_key_exists('hostgroups', $routeBlacklist)) {
|
||||
$section->add(N_('Host Groups'), [
|
||||
'url' => 'icingadb/hostgroups',
|
||||
'url' => 'icingadb/hostgroups',
|
||||
'priority' => 80,
|
||||
'icon' => 'network-wired'
|
||||
]);
|
||||
|
|
@ -502,24 +500,24 @@ namespace Icinga\Module\Icingadb
|
|||
|
||||
if (! array_key_exists('servicegroups', $routeBlacklist)) {
|
||||
$section->add(N_('Service Groups'), [
|
||||
'url' => 'icingadb/servicegroups',
|
||||
'url' => 'icingadb/servicegroups',
|
||||
'priority' => 80,
|
||||
'icon' => 'cogs'
|
||||
]);
|
||||
}
|
||||
|
||||
$section->add(N_('History'), [
|
||||
'url' => 'icingadb/history',
|
||||
'url' => 'icingadb/history',
|
||||
'priority' => 90,
|
||||
'icon' => 'history'
|
||||
]);
|
||||
$section->add(N_('Health'), [
|
||||
'url' => 'icingadb/health',
|
||||
'url' => 'icingadb/health',
|
||||
'priority' => 100,
|
||||
'icon' => 'heartbeat'
|
||||
]);
|
||||
$section->add(N_('Tactical Overview'), [
|
||||
'url' => 'icingadb/tactical',
|
||||
'url' => 'icingadb/tactical',
|
||||
'priority' => 110,
|
||||
'icon' => 'chart-pie'
|
||||
]);
|
||||
|
|
|
|||
|
|
@ -122,28 +122,22 @@ abstract class ProblemsBadge extends NavigationItemRenderer
|
|||
|
||||
$item->setCssClass('badge-nav-item icinga-module module-icingadb');
|
||||
|
||||
$html = new HtmlDocument();
|
||||
|
||||
$badge = $this->createBadge();
|
||||
|
||||
if ($this->linkDisabled) {
|
||||
$badge->addAttributes(['class' => 'disabled']);
|
||||
$this->setEscapeLabel(false);
|
||||
$label = $this->view()->escape($item->getLabel());
|
||||
$item->setLabel($badge . $label);
|
||||
|
||||
return (new HtmlDocument())
|
||||
->add(new HtmlString(parent::render($item)))
|
||||
->render();
|
||||
if ($badge !== null) {
|
||||
if ($this->linkDisabled) {
|
||||
$badge->addAttributes(['class' => 'disabled']);
|
||||
$this->setEscapeLabel(false);
|
||||
$label = $this->view()->escape($item->getLabel());
|
||||
$item->setLabel($badge . $label);
|
||||
} else {
|
||||
$html->add(new Link($badge, $this->getUrl(), ['title' => $this->getTitle()]));
|
||||
}
|
||||
}
|
||||
|
||||
$badge = new Link(
|
||||
$badge,
|
||||
$this->getUrl(),
|
||||
['title' => $this->getTitle()]
|
||||
);
|
||||
|
||||
return (new HtmlDocument())
|
||||
->add(new HtmlString(parent::render($item)))
|
||||
->add($badge)
|
||||
return $html
|
||||
->prepend(new HtmlString(parent::render($item)))
|
||||
->render();
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue