[icinga-checkins] icinga.org: icingaweb2/bugfix/History-grid-should-allow-filters-6638: Event history: display filter editor

git at icinga.org git at icinga.org
Wed Nov 26 16:16:07 CET 2014


Module: icingaweb2
Branch: bugfix/History-grid-should-allow-filters-6638
Commit: 0b3e306b8abdda0939394cae48b02338f8560d25
URL:    https://git.icinga.org/?p=icingaweb2.git;a=commit;h=0b3e306b8abdda0939394cae48b02338f8560d25

Author: Alexander Klimov <alexander.klimov at netways.de>
Date:   Wed Nov 26 16:07:33 2014 +0100

Event history: display filter editor

refs #6638

---

 modules/monitoring/application/controllers/ListController.php        |    1 +
 modules/monitoring/application/views/scripts/list/eventhistory.phtml |    1 +
 2 files changed, 2 insertions(+)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index c5d7cc9..21c808e 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -604,6 +604,7 @@ class Monitoring_ListController extends Controller
 
         $this->applyFilter($query);
 
+        $this->filterQuery($query);
         $this->setupSortControl(array(
             'timestamp' => 'Occurence'
         ));
diff --git a/modules/monitoring/application/views/scripts/list/eventhistory.phtml b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
index 4830f2a..c765b41 100644
--- a/modules/monitoring/application/views/scripts/list/eventhistory.phtml
+++ b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
@@ -14,6 +14,7 @@
 <?php endif ?>
 
 <div class="content">
+<?= $this->filterEditor ?>
 <?php if (empty($history)): ?>
   <?= $this->translate('No history events matching the filter') ?>
 </div>



More information about the icinga-checkins mailing list