From 5e8d8d6df016863fefc49c8132d323eb0f6ed08c Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 7 Jul 2016 02:07:31 -0700
Subject: [PATCH] Nicer date display

---
 resources/views/dashboard.blade.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/resources/views/dashboard.blade.php b/resources/views/dashboard.blade.php
index 75e1be6a80..bc188450a9 100755
--- a/resources/views/dashboard.blade.php
+++ b/resources/views/dashboard.blade.php
@@ -117,7 +117,7 @@
                                 <i class="fa fa-paperclip"></i>
                             @endif
                         </td>
-                       <td>{{ date("M d, Y H:iA", strtotime($activity->created_at)) }}</td>
+                       <td>{{ date("M d, Y g:iA", strtotime($activity->created_at)) }}</td>
                        <td>
                                  @if ($activity->action_type!='requested')
                                       <a href="{{ route('view/user', $activity->user_id) }}">{{ $activity->adminlog->fullName() }}</a>
@@ -150,7 +150,9 @@
                         @if (($activity->componentlog) && ($activity->asset_type=="component"))
                            <a href="{{ route('view/hardware', $activity->asset_id) }}">{{ $activity->assetlog->showAssetName() }}</a>
                         @elseif($activity->action_type=='requested')
-                          <a href="{{ route('view/user', $activity->user_id) }}">{{ $activity->adminlog->fullName() }}</a>
+                            @if ($activity->adminlog)
+                                <a href="{{ route('view/user', $activity->user_id) }}">{{ $activity->adminlog->fullName() }}</a>
+                            @endif
                        @elseif ($activity->userlog)
                           <a href="{{ route('view/user', $activity->checkedout_to) }}">{{ $activity->userlog->fullName() }}</a>