DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-21 03:15:45 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Added created_by results to user index API

Browse source 
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe 2022-06-23 17:19:30 -07:00
parent c9b81d65f1
commit d8daec2e0a
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/Http/Controllers/Api/UsersController.php
View file

@ -36,6 +36,7 @@ class UsersController extends Controller
$users = User::select([ $users = User::select([
'users.activated', 'users.activated',
'users.created_by',
'users.address', 'users.address',
'users.avatar', 'users.avatar',
'users.city', 'users.city',
@ -66,7 +67,7 @@ class UsersController extends Controller
'users.remote', 'users.remote',
'users.ldap_import', 'users.ldap_import',
])->with('manager', 'groups', 'userloc', 'company', 'department', 'assets', 'licenses', 'accessories', 'consumables') ])->with('manager', 'groups', 'userloc', 'company', 'department', 'assets', 'licenses', 'accessories', 'consumables', 'adminuser',)
->withCount('assets as assets_count', 'licenses as licenses_count', 'accessories as accessories_count', 'consumables as consumables_count'); ->withCount('assets as assets_count', 'licenses as licenses_count', 'accessories as accessories_count', 'consumables as consumables_count');
$users = Company::scopeCompanyables($users); $users = Company::scopeCompanyables($users);
@ -89,6 +90,10 @@ class UsersController extends Controller
$users = $users->where('users.location_id', '=', $request->input('location_id')); $users = $users->where('users.location_id', '=', $request->input('location_id'));
} }
if ($request->filled('created_by')) {
$users = $users->where('users.created_by', '=', $request->input('created_by'));
}
if ($request->filled('email')) { if ($request->filled('email')) {
$users = $users->where('users.email', '=', $request->input('email')); $users = $users->where('users.email', '=', $request->input('email'));
} }
@ -182,6 +187,9 @@ class UsersController extends Controller
case 'department': case 'department':
$users = $users->OrderDepartment($order); $users = $users->OrderDepartment($order);
break; break;
case 'created_by':
$users = $users->OrderAdmin($order);
break;
case 'company': case 'company':
$users = $users->OrderCompany($order); $users = $users->OrderCompany($order);
break; break;