diff options
| author | Simon Rettberg | 2016-08-15 16:31:54 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2016-08-15 16:31:54 +0200 |
| commit | fce78a63a56f42920ac40bbf76e67412933c8376 (patch) | |
| tree | 2baaff59dbce85d56f07da6f617058cbe0e6750f /modules-available/statistics/inc/filterset.inc.php | |
| parent | Update translations (diff) | |
| download | slx-admin-fce78a63a56f42920ac40bbf76e67412933c8376.tar.gz slx-admin-fce78a63a56f42920ac40bbf76e67412933c8376.tar.xz slx-admin-fce78a63a56f42920ac40bbf76e67412933c8376.zip | |
[statistics] Fix list view and sorting
Broken when moving JS snippets around
Diffstat (limited to 'modules-available/statistics/inc/filterset.inc.php')
| -rw-r--r-- | modules-available/statistics/inc/filterset.inc.php | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/modules-available/statistics/inc/filterset.inc.php b/modules-available/statistics/inc/filterset.inc.php index ea25d9b1..8f506654 100644 --- a/modules-available/statistics/inc/filterset.inc.php +++ b/modules-available/statistics/inc/filterset.inc.php @@ -16,8 +16,7 @@ class FilterSet $this->sortDirection = $direction === 'DESC' ? 'DESC' : 'ASC'; if (is_string($col) && array_key_exists($col, Page_Statistics::$columns)) { - $isMapped = array_key_exists('map_sort', Page_Statistics::$columns[$col]); - $this->sortColumn = $isMapped ? Page_Statistics::$columns[$col]['map_sort'] : $col; + $this->sortColumn = $col; } else { /* default sorting column is clientip */ $this->sortColumn = 'clientip'; @@ -42,8 +41,10 @@ class FilterSet } $join = implode('', array_unique($joins)); - - $sort = " ORDER BY " . $this->sortColumn . " " . $this->sortDirection; + $col = $this->sortColumn; + $isMapped = array_key_exists('map_sort', Page_Statistics::$columns[$col]); + $sort = " ORDER BY " . ($isMapped ? Page_Statistics::$columns[$col]['map_sort'] : $col) . " " . $this->sortDirection + . ", machineuuid ASC"; } public function getSortDirection() |