github/pyrodactyl
1
1
Fork 0
mirror of https://github.com/pyrohost/pyrodactyl.git synced 2026-04-06 04:01:58 +02:00
Code Issues 44 Packages Projects Releases Wiki Activity

Merge branch 'main' into dev

Browse Source 
Merge fixes/changes from main into dev
This commit is contained in:
KalebSchmidlkofer
2025-01-18 17:34:59 -08:00
parent 2150c82f19 af45f8372e
commit 59c8c201bb
1 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
app/Http/Controllers/Admin/UserController.php
View File

@@ -43,22 +43,34 @@ class UserController extends Controller
/**
* Display user index page.
*/
public function index(Request $request): View
{
$users = QueryBuilder::for(
User::query()->select('users.*')
->selectRaw('COUNT(DISTINCT(subusers.id)) as subuser_of_count')
->selectRaw('COUNT(DISTINCT(servers.id)) as servers_count')
->leftJoin('subusers', 'subusers.user_id', '=', 'users.id')
->leftJoin('servers', 'servers.owner_id', '=', 'users.id')
->groupBy('users.id')
)
->allowedFilters(['username', 'email', 'uuid'])
->allowedSorts(['id', 'uuid'])
->paginate(50);
public function index(Request $request): View
{
$users = QueryBuilder::for(
User::query()->select([
'users.id',
'users.username',
'users.email',
'users.created_at',
'users.updated_at',
])
->selectRaw('COUNT(DISTINCT(subusers.id)) as subuser_of_count')
->selectRaw('COUNT(DISTINCT(servers.id)) as servers_count')
->leftJoin('subusers', 'subusers.user_id', '=', 'users.id')
->leftJoin('servers', 'servers.owner_id', '=', 'users.id')
->groupBy([
'users.id',
'users.username',
'users.email',
'users.created_at',
'users.updated_at',
])
)
->allowedFilters(['username', 'email', 'uuid'])
->allowedSorts(['id', 'uuid'])
->paginate(50);
return $this->view->make('admin.users.index', ['users' => $users]);
}
return $this->view->make('admin.users.index', ['users' => $users]);
}
/**
* Display new user page.