mirror/snipe-it
3
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2026-02-06 00:25:45 +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

2
app/Http/Controllers/Users/UsersController.php
View File

@ -88,7 +88,6 @@ class UsersController extends Controller
//Username, email, and password need to be handled specially because the need to respect config values on an edit.
$user->email = trim($request->input('email'));
$user->username = trim($request->input('username'));
$user->display_name = $request->input('display_name');
if ($request->filled('password')) {
$user->password = bcrypt($request->input('password'));
}
@ -241,7 +240,6 @@ class UsersController extends Controller
$user->first_name = $request->input('first_name');
$user->last_name = $request->input('last_name');
$user->display_name = $request->input('display_name');
$user->two_factor_optin = $request->input('two_factor_optin') ?: 0;
$user->locale = $request->input('locale');
$user->employee_num = $request->input('employee_num');