Skip to content
Snippets Groups Projects
Commit d4927ddb authored by David Siegfried's avatar David Siegfried Committed by Jan-Hendrik Willms
Browse files

fix sorting, closes #1781

Closes #1781

Merge request studip/studip!1163
parent 0f1aa02c
No related branches found
No related tags found
No related merge requests found
...@@ -123,6 +123,9 @@ class Admin_UserController extends AuthenticatedController ...@@ -123,6 +123,9 @@ class Admin_UserController extends AuthenticatedController
$this->order = $this->order == 'desc' ? 'asc' : 'desc'; $this->order = $this->order == 'desc' ? 'asc' : 'desc';
} }
$request['sortby'] = $this->sortby;
$request['order'] = $this->order;
$empty_search = $request['perm'] === 'alle'; $empty_search = $request['perm'] === 'alle';
$values = [ $values = [
......
...@@ -448,8 +448,9 @@ class User extends AuthUserMd5 implements Range, PrivacyObject ...@@ -448,8 +448,9 @@ class User extends AuthUserMd5 implements Range, PrivacyObject
$query .= implode(' AND ', $where); $query .= implode(' AND ', $where);
$query .= " GROUP BY au.`user_id` "; $query .= " GROUP BY au.`user_id` ";
if (!empty($attributes['sortby'])) {
//sortieren //sortieren
switch ($attributes['sort']) { switch ($attributes['sortby']) {
case "perms": case "perms":
$query .= "ORDER BY au.`perms` {$attributes['order']}, au.`username`"; $query .= "ORDER BY au.`perms` {$attributes['order']}, au.`username`";
break; break;
...@@ -474,6 +475,7 @@ class User extends AuthUserMd5 implements Range, PrivacyObject ...@@ -474,6 +475,7 @@ class User extends AuthUserMd5 implements Range, PrivacyObject
default: default:
$query .= " ORDER BY au.`username` {$attributes['order']}"; $query .= " ORDER BY au.`username` {$attributes['order']}";
} }
}
return DBManager::get()->fetchAll($query, $params, __CLASS__ . '::buildExisting'); return DBManager::get()->fetchAll($query, $params, __CLASS__ . '::buildExisting');
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment