tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-23 05:44:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

monitoring: Fix that sorting a data view is not possible if its sort

Browse Source 
rules are empty
This commit is contained in:
Alexander Fuhr 2014-10-07 16:05:20 +02:00
parent 421263af00
commit a9ae75b6b0
1 changed files with 37 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/monitoring/library/Monitoring/DataView/DataView.php
View File

@ -204,9 +204,11 @@ public function dump()
public function sort($column = null, $order = null) public function sort($column = null, $order = null)
{ {
$sortRules = $this->getSortRules(); $sortRules = $this->getSortRules();
if ($sortRules !== null) {
if ($column === null) { if ($column === null) {
// Use first available sort rule as default
if (empty($sortRules)) {
return $this;
}
$sortColumns = reset($sortRules); $sortColumns = reset($sortRules);
if (! isset($sortColumns['columns'])) { if (! isset($sortColumns['columns'])) {
$sortColumns['columns'] = array(key($sortRules)); $sortColumns['columns'] = array(key($sortRules));
@ -239,7 +241,6 @@ public function dump()
$this->query->order($column, $order); $this->query->order($column, $order);
} }
$this->isSorted = true; $this->isSorted = true;
}
return $this; return $this;
} }
@ -250,7 +251,7 @@ public function dump()
*/ */
public function getSortRules() public function getSortRules()
{ {
return null; return array();
} }
/** /**
@ -365,6 +366,9 @@ public function dump()
*/ */
public function paginate($itemsPerPage = null, $pageNumber = null) public function paginate($itemsPerPage = null, $pageNumber = null)
{ {
if (! $this->isSorted) {
$this->order();
}
return $this->query->paginate($itemsPerPage, $pageNumber); return $this->query->paginate($itemsPerPage, $pageNumber);
} }