webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-08-09 10:22:51 +03:00
Code Activity

Redesigned users list to be responsive and aligned

Browse Source
This commit is contained in:
Dan Brown
2022-10-29 15:23:21 +01:00
parent 2a65331573
commit 986346a0e9
13 changed files with 127 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Auth/Queries/AllUsersPaginatedAndSorted.php
View File

@@ -19,6 +19,9 @@ class AllUsersPaginatedAndSorted
public function run(int $count, array $sortData): LengthAwarePaginator
{
$sort = $sortData['sort'];
if ($sort === 'created_at') {
$sort = 'users.created_at';
}
$query = User::query()->select(['*'])
->scopes(['withLastActivityAt'])

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

@@ -37,15 +37,15 @@ class UserController extends Controller
{
$this->checkPermission('users-manage');
$listDetails = [
'order' => $request->get('order', 'asc'),
'search' => $request->get('search', ''),
'sort' => $request->get('sort', 'name'),
'sort' => setting()->getForCurrentUser('users_sort', 'name'),
'order' => setting()->getForCurrentUser('users_sort_order', 'asc'),
];
$users = (new AllUsersPaginatedAndSorted())->run(20, $listDetails);
$this->setPageTitle(trans('settings.users'));
$users->appends($listDetails);
$users->appends(['search' => $listDetails['search']]);
return view('users.index', [
'users' => $users,
@@ -251,7 +251,7 @@ class UserController extends Controller
*/
public function changeSort(Request $request, string $id, string $type)
{
$validSortTypes = ['books', 'bookshelves', 'shelf_books'];
$validSortTypes = ['books', 'bookshelves', 'shelf_books', 'users'];
if (!in_array($type, $validSortTypes)) {
return redirect()->back(500);
}
@@ -318,7 +318,7 @@ class UserController extends Controller
$this->checkPermissionOrCurrentUser('users-manage', $userId);
$sort = $request->get('sort');
if (!in_array($sort, ['name', 'created_at', 'updated_at', 'default'])) {
if (!in_array($sort, ['name', 'created_at', 'updated_at', 'default', 'email', 'last_activity_at'])) {
$sort = 'name';
}