diff --git a/resources/views/dashboard.blade.php b/resources/views/dashboard.blade.php index 75e1be6a8..bc188450a 100755 --- a/resources/views/dashboard.blade.php +++ b/resources/views/dashboard.blade.php @@ -117,7 +117,7 @@ @endif - {{ date("M d, Y H:iA", strtotime($activity->created_at)) }} + {{ date("M d, Y g:iA", strtotime($activity->created_at)) }} @if ($activity->action_type!='requested') {{ $activity->adminlog->fullName() }} @@ -150,7 +150,9 @@ @if (($activity->componentlog) && ($activity->asset_type=="component")) {{ $activity->assetlog->showAssetName() }} @elseif($activity->action_type=='requested') - {{ $activity->adminlog->fullName() }} + @if ($activity->adminlog) + {{ $activity->adminlog->fullName() }} + @endif @elseif ($activity->userlog) {{ $activity->userlog->fullName() }}