From 2e274b5f21bec92541e72e03cb2ea8cd6d8b5e5a Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Fri, 3 Mar 2017 18:41:13 -0800
Subject: [PATCH] Fixed user upload route

---
 resources/views/users/view.blade.php | 12 ++++++++++--
 routes/web/users.php                 |  1 +
 2 files changed, 11 insertions(+), 2 deletions(-)

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 @@
                     <td>Name</td>
                     <td>{{ $user->present()->fullName() }}</td>
                   </tr>
+
+                  @if ($user->last_login)
+                    <tr>
+                      <td>{{ trans('general.last_login') }}</td>
+                      <td>{{ \App\Helpers\Helper::getFormattedDateObject($user->last_login, 'datetime', false) }}</td>
+                    </tr>
+                  @endif
+
                   @if ($user->jobtitle)
                   <tr>
                     <td>Title</td>
@@ -232,12 +240,12 @@
                 <tr>
                   <td>
                     @if ($asset->physical=='1')
-                    {!! $asset->model->present()->nameUrl() !!}
+                      <a href="{{ route('models.show', $asset->model->id) }}">{{ $asset->model->name }}</a>
                     @endif
                   </td>
                   <td>
                     @can('view', $asset)
-                    {!! $asset->present()->assetTagUrl() !!}
+                      <a href="{{ route('hardware.show', $asset->id) }}">{{ $asset->asset_tag }}</a>
                     @endcan
                   </td>
                   <td>{!! $asset->present()->nameUrl() !!}</td>
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' ]