mirror of
https://github.com/snipe/snipe-it.git
synced 2024-11-10 23:54:12 -08:00
Wrong branch. :(
This commit is contained in:
parent
532b299c40
commit
f7de252f67
|
@ -132,7 +132,6 @@ 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',
|
||||||
|
@ -161,12 +160,8 @@ 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;
|
||||||
|
|
Loading…
Reference in a new issue