Fixes #3092 - user location not being exported correctly

snipe · Dec 22, 2016 · 2fe9840 · 2fe9840
1 parent 323c380
commit 2fe9840
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/app/Http/Controllers/UsersController.php b/app/Http/Controllers/UsersController.php
@@ -1250,7 +1250,7 @@ public function getExportUserCsv()
  $user->username,
  $user->email,
  ($user->manager) ? $user->manager->fullName() : '',
- ($user->location) ? $user->location->name : '',
+ ($user->userloc) ? $user->userloc->name : '',
  $user->assets->count(),
  $user->licenses->count(),
  $user->accessories->count(),

diff --git a/config/app.php b/config/app.php
@@ -287,6 +287,7 @@
  'Form' => 'Collective\Html\FormFacade',
  'Html' => 'Collective\Html\HtmlFacade',
  'Google2FA' => PragmaRX\Google2FA\Vendor\Laravel\Facade::class,
+ 'Debugbar' => Barryvdh\Debugbar\Facade::class,
 
 
  ],

diff --git a/resources/views/users/index.blade.php b/resources/views/users/index.blade.php
@@ -29,7 +29,7 @@
  <a class="btn btn-default pull-right" href="{{ route('users.index', ['status' => 'deleted']) }}" style="margin-right: 5px;">{{ trans('admin/users/table.show_deleted') }}</a>
  @endif
  @can('view', \App\Models\User::class)
- <a class="btn btn-default pull-right" href="{{ url('admin/users/export') }}" style="margin-right: 5px;">Export</a>
+ <a class="btn btn-default pull-right" href="{{ route('users.export') }}" style="margin-right: 5px;">Export</a>
  @endcan
 
 @stop

diff --git a/routes/web/users.php b/routes/web/users.php
@@ -7,7 +7,7 @@
  Route::post('ldap', 'UsersController@postLDAP');
  Route::get('import', [ 'as' => 'import/user', 'uses' => 'UsersController@getImport' ]);
  Route::post('import', [ 'uses' => 'UsersController@postImport' ]);
- Route::get('export', [ 'uses' => 'UsersController@getExportUserCsv' ]);
+ Route::get('export', [ 'as' => 'users.export', 'uses' => 'UsersController@getExportUserCsv' ]);
  Route::get('{userId}/clone', [ 'as' => 'clone/user', 'uses' => 'UsersController@getClone' ]);
  Route::post('{userId}/clone', [ 'uses' => 'UsersController@postCreate' ]);
  Route::get('{userId}/restore', [ 'as' => 'restore/user', 'uses' => 'UsersController@getRestore' ]);