Merge remote-tracking branch 'origin/develop'

Author: snipe

app/Models/Asset.php

@@ -376,7 +376,10 @@ public function showAssetName()
     {
 
         if ($this->name == '') {
-            return $this->model->name.' ('.$this->asset_tag.')';
+            if ($this->model) {
+                return $this->model->name.' ('.$this->asset_tag.')';
+            }
+            return $this->asset_tag;
         } else {
             return $this->name;
         }

resources/views/dashboard.blade.php

@@ -120,7 +120,11 @@
                        <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>
+                                     @if ($activity->adminlog)
+                                        <a href="{{ route('view/user', $activity->user_id) }}">{{ $activity->adminlog->fullName() }}</a>
+                                     @else
+                                        Deleted Admin
+                                     @endif
                                  @endif
 
                                  </td>