[icinga-checkins] icinga.org: icingaweb2/master: list/eventgrid: workaround for custom filtering

git at icinga.org git at icinga.org
Sun Nov 16 00:38:44 CET 2014


Module: icingaweb2
Branch: master
Commit: 87c8e58dabd701d4843b582a652f7bd3df96d730
URL:    https://git.icinga.org/?p=icingaweb2.git;a=commit;h=87c8e58dabd701d4843b582a652f7bd3df96d730

Author: Thomas Gelf <thomas at gelf.net>
Date:   Sun Nov 16 00:37:58 2014 +0100

list/eventgrid: workaround for custom filtering

---

 modules/monitoring/application/controllers/ListController.php |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 36db720..ada291a 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -406,7 +406,7 @@ class Monitoring_ListController extends Controller
         $this->view->form = $form;
 
         $orientation = $this->params->shift('vertical', 0) ? 'vertical' : 'horizontal';
-
+/*
         $orientationBox = new SelectBox(
             'orientation',
             array(
@@ -417,7 +417,7 @@ class Monitoring_ListController extends Controller
             'horizontal'
         );
         $orientationBox->applyRequest($this->getRequest());
-
+*/
         $query = $this->backend->select()->from(
             'eventgrid',
             array('day', $form->getValue('state'))
@@ -426,7 +426,7 @@ class Monitoring_ListController extends Controller
         $this->filterQuery($query);
         $this->view->summary = $query->getQuery()->fetchAll();
         $this->view->column = $form->getValue('state');
-        $this->view->orientationBox = $orientationBox;
+//        $this->view->orientationBox = $orientationBox;
         $this->view->orientation = $orientation;
     }
 
@@ -615,7 +615,7 @@ class Monitoring_ListController extends Controller
         $editor = Widget::create('filterEditor')
             ->setQuery($query)
             ->preserveParams('limit', 'sort', 'dir', 'format', 'view', 'backend')
-            ->ignoreParams('page')
+            ->ignoreParams('page', 'objecttype', 'from', 'to', 'state', 'btn_submit')
             ->handleRequest($this->getRequest());
         $query->applyFilter($editor->getFilter());
 



More information about the icinga-checkins mailing list