From 7fe056d03ac4bdf4527635f94f61084f9df3c1a8 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Mon, 30 Jun 2014 12:13:04 +0200
Subject: [PATCH] Display note when host and service is not found

When the show/host and show/service views do not find a host or service,
don't show a non-working view, but display a error message

fixes #6469
---
 .../application/views/scripts/show/host.phtml | 56 ++++++++++---------
 .../views/scripts/show/service.phtml          | 56 ++++++++++---------
 2 files changed, 60 insertions(+), 52 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/show/host.phtml b/modules/monitoring/application/views/scripts/show/host.phtml
index da93bd8e6..a0e50389d 100644
--- a/modules/monitoring/application/views/scripts/show/host.phtml
+++ b/modules/monitoring/application/views/scripts/show/host.phtml
@@ -1,27 +1,31 @@
-<div class="controls">
-<?= $this->render('show/components/header.phtml') ?>
-<h1><?= $this->translate("This host's current state") ?></h1>
-</div>
-<div class="content" data-base-target="_next">
-<?= $this->render('show/components/output.phtml') ?>
-<?= $this->render('show/components/grapher.phtml') ?>
+<?php if ($object->host_name !== false): ?>
+    <div class="controls">
+    <?= $this->render('show/components/header.phtml') ?>
+    <h1><?= $this->translate("This host's current state") ?></h1>
+    </div>
+    <div class="content" data-base-target="_next">
+    <?= $this->render('show/components/output.phtml') ?>
+    <?= $this->render('show/components/grapher.phtml') ?>
 
-<table class="avp newsection">
- <tbody>
-<?= $this->render('show/components/acknowledgement.phtml') ?>
-<?= $this->render('show/components/comments.phtml') ?>
-<?= $this->render('show/components/notifications.phtml') ?>
-<?= $this->render('show/components/downtime.phtml') ?>
-<?= $this->render('show/components/flapping.phtml') ?>
-<?= $this->render('show/components/perfdata.phtml') ?>
-<?= $this->render('show/components/checksource.phtml') ?>
-<?= $this->render('show/components/actions.phtml') ?>
-<?= $this->render('show/components/command.phtml') ?>
-<?= $this->render('show/components/hostgroups.phtml') ?>
-<?= $this->render('show/components/contacts.phtml') ?>
-<?= $this->render('show/components/checkstatistics.phtml') ?>
-<?= $this->render('show/components/customvars.phtml') ?>
-<?= $this->render('show/components/flags.phtml') ?>
- </tbody>
-</table>
-</div>
+    <table class="avp newsection">
+     <tbody>
+    <?= $this->render('show/components/acknowledgement.phtml') ?>
+    <?= $this->render('show/components/comments.phtml') ?>
+    <?= $this->render('show/components/notifications.phtml') ?>
+    <?= $this->render('show/components/downtime.phtml') ?>
+    <?= $this->render('show/components/flapping.phtml') ?>
+    <?= $this->render('show/components/perfdata.phtml') ?>
+    <?= $this->render('show/components/checksource.phtml') ?>
+    <?= $this->render('show/components/actions.phtml') ?>
+    <?= $this->render('show/components/command.phtml') ?>
+    <?= $this->render('show/components/hostgroups.phtml') ?>
+    <?= $this->render('show/components/contacts.phtml') ?>
+    <?= $this->render('show/components/checkstatistics.phtml') ?>
+    <?= $this->render('show/components/customvars.phtml') ?>
+    <?= $this->render('show/components/flags.phtml') ?>
+     </tbody>
+    </table>
+    </div>
+<?php else: ?>
+    <p> Host not found </p>
+<?php endif ?>
diff --git a/modules/monitoring/application/views/scripts/show/service.phtml b/modules/monitoring/application/views/scripts/show/service.phtml
index b710a813f..f3cb1630c 100644
--- a/modules/monitoring/application/views/scripts/show/service.phtml
+++ b/modules/monitoring/application/views/scripts/show/service.phtml
@@ -1,27 +1,31 @@
-<div class="controls">
-<?= $this->render('show/components/header.phtml') ?>
-<h1><?= $this->translate("This service's current state") ?></h1>
-</div>
-<div class="content" data-base-target="_next">
-<?= $this->render('show/components/output.phtml') ?>
-<?= $this->render('show/components/grapher.phtml') ?>
+<?php if ($object->host_name !== false): ?>
+    <div class="controls">
+    <?= $this->render('show/components/header.phtml') ?>
+    <h1><?= $this->translate("This service's current state") ?></h1>
+    </div>
+    <div class="content" data-base-target="_next">
+    <?= $this->render('show/components/output.phtml') ?>
+    <?= $this->render('show/components/grapher.phtml') ?>
 
-<table class="avp newsection">
- <tbody>
-<?= $this->render('show/components/acknowledgement.phtml') ?>
-<?= $this->render('show/components/comments.phtml') ?>
-<?= $this->render('show/components/notifications.phtml') ?>
-<?= $this->render('show/components/downtime.phtml') ?>
-<?= $this->render('show/components/flapping.phtml') ?>
-<?= $this->render('show/components/perfdata.phtml') ?>
-<?= $this->render('show/components/checksource.phtml') ?>
-<?= $this->render('show/components/actions.phtml') ?>
-<?= $this->render('show/components/command.phtml') ?>
-<?= $this->render('show/components/servicegroups.phtml') ?>
-<?= $this->render('show/components/contacts.phtml') ?>
-<?= $this->render('show/components/checkstatistics.phtml') ?>
-<?= $this->render('show/components/customvars.phtml') ?>
-<?= $this->render('show/components/flags.phtml') ?>
- </tbody>
-</table>
-</div>
+    <table class="avp newsection">
+     <tbody>
+    <?= $this->render('show/components/acknowledgement.phtml') ?>
+    <?= $this->render('show/components/comments.phtml') ?>
+    <?= $this->render('show/components/notifications.phtml') ?>
+    <?= $this->render('show/components/downtime.phtml') ?>
+    <?= $this->render('show/components/flapping.phtml') ?>
+    <?= $this->render('show/components/perfdata.phtml') ?>
+    <?= $this->render('show/components/checksource.phtml') ?>
+    <?= $this->render('show/components/actions.phtml') ?>
+    <?= $this->render('show/components/command.phtml') ?>
+    <?= $this->render('show/components/servicegroups.phtml') ?>
+    <?= $this->render('show/components/contacts.phtml') ?>
+    <?= $this->render('show/components/checkstatistics.phtml') ?>
+    <?= $this->render('show/components/customvars.phtml') ?>
+    <?= $this->render('show/components/flags.phtml') ?>
+     </tbody>
+    </table>
+    </div>
+<?php else: ?>
+    <p> Service not found </p>
+<?php endif ?>