diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php
index 66569096f4..5e7558654e 100755
--- a/resources/views/users/view.blade.php
+++ b/resources/views/users/view.blade.php
@@ -126,6 +126,14 @@
Name |
{{ $user->present()->fullName() }} |
+
+ @if ($user->last_login)
+
+ | {{ trans('general.last_login') }} |
+ {{ \App\Helpers\Helper::getFormattedDateObject($user->last_login, 'datetime', false) }} |
+
+ @endif
+
@if ($user->jobtitle)
| Title |
@@ -232,12 +240,12 @@
|
@if ($asset->physical=='1')
- {!! $asset->model->present()->nameUrl() !!}
+ {{ $asset->model->name }}
@endif
|
@can('view', $asset)
- {!! $asset->present()->assetTagUrl() !!}
+ {{ $asset->asset_tag }}
@endcan
|
{!! $asset->present()->nameUrl() !!} |
diff --git a/routes/web/users.php b/routes/web/users.php
index b9137cce08..8614db73f0 100644
--- a/routes/web/users.php
+++ b/routes/web/users.php
@@ -12,6 +12,7 @@ Route::group([ 'prefix' => 'users', 'middleware' => ['web','auth']], function ()
Route::post('{userId}/clone', [ 'uses' => 'UsersController@postCreate' ]);
Route::get('{userId}/restore', [ 'as' => 'restore/user', 'uses' => 'UsersController@getRestore' ]);
Route::get('{userId}/unsuspend', [ 'as' => 'unsuspend/user', 'uses' => 'UsersController@getUnsuspend' ]);
+ Route::post('{userId}/upload', [ 'as' => 'upload/user', 'uses' => 'UsersController@postUpload' ]);
Route::get(
'{userId}/deletefile/{fileId}',
[ 'as' => 'delete/userfile', 'uses' => 'UsersController@getDeleteFile' ]