monitoring/list: ignore post in applyFilter

refs #6644
Icinga · Sep 2, 2014 · d8e71d3 · d8e71d3
1 parent 19136b5
commit d8e71d3
Showing 1 changed file with 5 additions and 10 deletions.
diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
@@ -501,15 +501,8 @@ protected function applyFilters($query)
         $request = $this->getRequest();
 
         $limit   = $params->shift('limit');
-
-        $sort = null;
-        $dir = null;
-        if ($request->isPost()) {
-            $sort = $request->getPost('sort', null);
-            $dir  = $request->getPost('dir', null);
-        }
-        $sort    = $params->shift('sort', $sort);
-        $dir     = $params->shift('dir', $dir);
+        $sort    = $params->shift('sort');
+        $dir     = $params->shift('dir');
         $page    = $params->shift('page');
         $format  = $params->shift('format');
         $view    = $params->shift('view');
@@ -546,7 +539,9 @@ protected function applyFilters($query)
             $query->applyFilter($filter);
         }
         $this->view->filter = $filter;
-        $query->order($sort, $dir);
+        if ($sort) {
+            $query->order($sort, $dir);
+        }
         $this->applyRestrictions($query);
         $this->handleFormatRequest($query);
         return $query;