Show better error message for unknown downtimes

refs #8902
Icinga · May 7, 2015 · 20b25e6 · 20b25e6
1 parent 9114a34
commit 20b25e6
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/modules/monitoring/application/controllers/DowntimeController.php b/modules/monitoring/application/controllers/DowntimeController.php
@@ -76,12 +76,14 @@ public function init()
 
     public function showAction()
     {
+        if (false === $this->downtime) {
+            return;
+        }
         $this->view->downtime = $this->downtime;
         $this->view->isService = $this->isService;
         $this->view->stateName = isset($this->downtime->service_description) ? 
                 Service::getStateText($this->downtime->service_state) :
                 Host::getStateText($this->downtime->host_state);
-
         $this->view->delDowntimeForm = $this->createDelDowntimeForm();
         $this->view->listAllLink = Url::fromPath('monitoring/list/downtimes');
         $this->view->showHostLink = Url::fromPath('monitoring/host/show')

diff --git a/modules/monitoring/application/views/scripts/downtime/show.phtml b/modules/monitoring/application/views/scripts/downtime/show.phtml
@@ -1,4 +1,10 @@
 <div class="controls">
+  <?php if (! isset($downtime)): ?>
+    <?= $this->translate('No scheduled downtime matching the filter.') ?>
+    </div>
+    <?php return; ?>
+  <?php endif; ?>
+
   <?php if (! $this->compact): ?>
     <?= $this->tabs; ?>
   <?php endif ?>

diff --git a/modules/monitoring/application/views/scripts/list/downtimes.phtml b/modules/monitoring/application/views/scripts/list/downtimes.phtml
@@ -15,7 +15,8 @@ if (! $this->compact): ?>
 <?php
 
 if (count($downtimes) === 0) {
-    echo $this->translate('No downtimes found matching the filter') . '</div>';
+    echo $this->translate('No downtimes found matching the filter,'
+            . ' maybe the downtime already expired.') . '</div>';
     return;
 }
 ?>