tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

monitoring/list: ignore post in applyFilter 

refs #6644
This commit is contained in:
Thomas Gelf 2014-09-02 14:07:46 +02:00
parent 19136b548a
commit d8e71d3790
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
modules/monitoring/application/controllers/ListController.php
View File

@ -501,15 +501,8 @@ class Monitoring_ListController extends Controller
$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 @@ class Monitoring_ListController extends Controller
$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;