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

Add support for order next to the column to DataView::getSortRules() 

refs #8716
This commit is contained in:
Eric Lippmann 2015-03-13 17:12:16 +01:00
parent 949438d753
commit 7ddd8d7ad2
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -242,6 +242,7 @@ abstract class DataView implements Browsable, Countable, Filterable, Sortable
$order = (strtoupper($order) === static::SORT_ASC) ? 'ASC' : 'DESC'; $order = (strtoupper($order) === static::SORT_ASC) ? 'ASC' : 'DESC';
foreach ($sortColumns['columns'] as $column) { foreach ($sortColumns['columns'] as $column) {
list($column, $direction) = $this->query->splitOrder($column);
if (! $this->isValidFilterTarget($column)) { if (! $this->isValidFilterTarget($column)) {
throw new QueryException( throw new QueryException(
mt('monitoring', 'The sort column "%s" is not allowed in "%s".'), mt('monitoring', 'The sort column "%s" is not allowed in "%s".'),
@ -249,7 +250,7 @@ abstract class DataView implements Browsable, Countable, Filterable, Sortable
get_class($this) get_class($this)
); );
} }
$this->query->order($column, $order); $this->query->order($column, $direction !== null ? $direction : $order);
} }
$this->isSorted = true; $this->isSorted = true;
return $this; return $this;