From cbc42f3e595bbba0ad0f066939365751b2fd0961 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 2 Aug 2016 04:45:48 -0700
Subject: [PATCH] Fix for deleted users display

---
 resources/views/dashboard.blade.php  |  2 ++
 resources/views/users/view.blade.php | 13 ++++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/resources/views/dashboard.blade.php b/resources/views/dashboard.blade.php
index 59b9ef77e..53df8bd1e 100755
--- a/resources/views/dashboard.blade.php
+++ b/resources/views/dashboard.blade.php
@@ -152,6 +152,8 @@
                                <a href="{{ route('view/component', $activity->component_id) }}">{{ $activity->componentlog->name }}</a>
                             @elseif (($activity->assetlog) && ($activity->action_type=="uploaded"))
                                    <a href="{{ route('view/hardware', $activity->asset_id) }}">{{ $activity->assetlog->showAssetName() }}</a>
+                           @elseif (($activity->userlog) && ($activity->action_type=="uploaded"))
+                               <a href="{{ route('view/user', $activity->asset_id) }}">{{ $activity->userlog->fullName() }}</a>
                             @else
                                 {{ trans('general.bad_data') }}
                             @endif
diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php
index c83204809..88d5c635e 100755
--- a/resources/views/users/view.blade.php
+++ b/resources/views/users/view.blade.php
@@ -442,7 +442,18 @@
                           @endif
 
                         </td>
-                        <td>{{ $log->adminlog->fullName() }}</td>
+                        <td>@if ($log->adminlog)
+
+                                @if ($log->adminlog->deleted_at=='')
+                                    <a href="{{ route('view/user', $log->checkedout_to) }}">
+                                        {{ $log->adminlog->fullName() }}
+                                    </a>
+                                @else
+                                    <del>{{ $log->adminlog->fullName() }}</del>
+                                @endif
+                            @else
+                                Deleted User
+                            @endif</td>
                     </tr>
                     @endforeach
                 </tbody>