DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-10 23:54:12 -08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse source
This commit is contained in:
snipe 2018-01-19 23:47:54 -08:00
parent f7de252f67 e6f70f2ab7
commit 984275ff05
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -132,6 +132,7 @@ class UsersController extends Controller
$users = User::select( $users = User::select(
[ [
'users.id', 'users.id',
'users.username',
'users.employee_num', 'users.employee_num',
'users.first_name', 'users.first_name',
'users.last_name', 'users.last_name',
@ -160,8 +161,12 @@ class UsersController extends Controller
} }
$name_str .= e($user->first_name); $name_str .= e($user->first_name);
if ($user->username!='') {
$name_str .= ' ('.e($user->username).')';
}
if ($user->employee_num!='') { if ($user->employee_num!='') {
$name_str .= ' (#'.e($user->employee_num).')'; $name_str .= ' - #'.e($user->employee_num);
} }
$user->use_text = $name_str; $user->use_text = $name_str;