mirror/snipe-it
3
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2026-03-29 20:04:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into add-display-name-to-users-fixed

Browse Source
This commit is contained in:
snipe
2025-08-25 15:28:20 +01:00
committed by GitHub
parent e60f2b2332 6503f9c667
commit c8e79aa5ca
46 changed files with 19958 additions and 1191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,7 +64,6 @@ class UsersController extends Controller
'users.jobtitle',
'users.last_login',
'users.last_name',
'users.display_name',
'users.locale',
'users.location_id',
'users.manager_id',
@ -155,10 +154,6 @@ class UsersController extends Controller
$users = $users->where('users.last_name', '=', $request->input('last_name'));
}
if ($request->filled('display_name')) {
$users = $users->where('users.display_name', '=', $request->input('display_name'));
}
if ($request->filled('employee_num')) {
$users = $users->where('users.employee_num', '=', $request->input('employee_num'));
}
@ -289,7 +284,6 @@ class UsersController extends Controller
[
'last_name',
'first_name',
'display_name',
'email',
'jobtitle',
'username',
@ -515,10 +509,6 @@ class UsersController extends Controller
$user->username = $request->input('username');
}
if ($request->filled('display_name')) {
$user->display_name = $request->input('display_name');
}
if ($request->filled('email')) {
$user->email = $request->input('email');
}