archive/BookStackApp_BookStack
0
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-05-17 13:52:04 +00:00
Code Issues Projects Releases Wiki Activity

Revised role index list to align with user list

Browse source
This commit is contained in:
Dan Brown 2022-10-29 20:52:17 +01:00
parent 0ef06fd298
commit 98b59a1024
No known key found for this signature in database
GPG key ID: 46D9F943C24A2EF9
8 changed files with 109 additions and 43 deletions
app/Http/Controllers
UserController.php

10
app/Http/Controllers/UserController.php
View file

@ -251,7 +251,7 @@ class UserController extends Controller
*/
public function changeSort(Request $request, string $id, string $type)
{
$validSortTypes = ['books', 'bookshelves', 'shelf_books', 'users'];
$validSortTypes = ['books', 'bookshelves', 'shelf_books', 'users', 'roles'];
if (!in_array($type, $validSortTypes)) {
return redirect()->back(500);
}
@ -318,7 +318,13 @@ class UserController extends Controller
$this->checkPermissionOrCurrentUser('users-manage', $userId);
$sort = $request->get('sort');
if (!in_array($sort, ['name', 'created_at', 'updated_at', 'default', 'email', 'last_activity_at'])) {
// TODO - Need to find a better way to validate sort options
// Probably better to do a simple validation here then validate at usage.
$validSorts = [
'name', 'created_at', 'updated_at', 'default', 'email', 'last_activity_at', 'display_name',
'users_count', 'permissions_count',
];
if (!in_array($sort, $validSorts)) {
$sort = 'name';
}