DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-25 05:34:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'hotfixes/add_username_to_csv_export' into develop

Browse source
This commit is contained in:
snipe 2016-10-25 02:51:27 -07:00
parent d24c4b1152 1793461642
commit 85f3cc1762
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/Http/Controllers/UsersController.php
View file

@ -1301,10 +1301,11 @@ class UsersController extends Controller
$headers=[ $headers=[
// strtolower to prevent Excel from trying to open it as a SYLK file // strtolower to prevent Excel from trying to open it as a SYLK file
strtolower(trans('general.id')), strtolower(trans('general.id')),
trans('general.company'),
trans('admin/companies/table.title'), trans('admin/companies/table.title'),
trans('admin/users/table.title'),
trans('admin/users/table.employee_num'), trans('admin/users/table.employee_num'),
trans('admin/users/table.name'), trans('admin/users/table.name'),
trans('admin/users/table.username'),
trans('admin/users/table.email'), trans('admin/users/table.email'),
trans('admin/users/table.manager'), trans('admin/users/table.manager'),
trans('admin/users/table.location'), trans('admin/users/table.location'),
@ -1331,9 +1332,10 @@ class UsersController extends Controller
$values = [ $values = [
$user->id, $user->id,
($user->company) ? $user->company->name : '', ($user->company) ? $user->company->name : '',
$user->title, $user->jobtitle,
$user->employee_num, $user->employee_num,
$user->fullName(), $user->fullName(),
$user->username,
$user->email, $user->email,
($user->manager) ? $user->manager->fullName() : '', ($user->manager) ? $user->manager->fullName() : '',
($user->location) ? $user->location->name : '', ($user->location) ? $user->location->name : '',