From 342a8a39d103c2d49bb32e8f9bd3f9f5ac389bcc Mon Sep 17 00:00:00 2001 From: Matthias Jentsch Date: Mon, 18 May 2015 14:58:51 +0200 Subject: [PATCH] Fix state summary in multi views refs #8565 --- .../views/scripts/list/components/hostssummary.phtml | 4 ++-- .../views/scripts/list/components/servicesummary.phtml | 2 +- .../views/scripts/partials/service/objects-header.phtml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml b/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml index 3ecb2279a..a21a6c9ea 100644 --- a/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml +++ b/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml @@ -14,7 +14,7 @@ function urlAddFilterOptional($url, $filter, $optional) { $this->baseFilter = isset($this->baseFilter) ? $this->baseFilter : null; $selfUrl = 'monitoring/list/hosts'; $currentUrl = Url::fromRequest()->getRelativeUrl(); -?>
compact ? ' data-base-target="col1"' : ''; ?>> +?>
compact ? ' data-base-target="col1"' : ''; ?>> translate('%s hosts:'), $this->stats->hosts_total); ?> stats->hosts_up): ?> @@ -67,7 +67,7 @@ $currentUrl = Url::fromRequest()->getRelativeUrl(); $this->stats->hosts_down_handled, urlAddFilterOptional( $selfUrl, - Filter::matchAll(Filter::where('host_state', 1), Filter::where('host_unhandled', 1)), + Filter::matchAll(Filter::where('host_state', 1), Filter::where('host_unhandled', 0)), $this->baseFilter ), null, diff --git a/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml b/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml index 76a51de92..97d5f9fdf 100644 --- a/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml +++ b/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml @@ -16,7 +16,7 @@ $this->baseFilter = isset($this->baseFilter) ? $this->baseFilter : null; $selfUrl = 'monitoring/list/services'; $currentUrl = Url::fromRequest()->getRelativeUrl(); -?>
compact ? ' data-base-target="col1"' : ''; ?>> +?>
compact ? ' data-base-target="col1"' : ''; ?>> translate('%s services:'), $this->stats->services_total); ?> stats->services_ok): ?> diff --git a/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml b/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml index e3c1227f3..c51861f03 100644 --- a/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml +++ b/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml @@ -4,7 +4,7 @@ use Icinga\Module\Monitoring\Object\Service; $i = 0; ?> 0): ?> - +