From 0e5209e80fdd1470c99ce17a997146badfc1ae10 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 2 Aug 2016 05:06:17 -0700
Subject: [PATCH] Few more dashboard fixes

---
 app/Models/Actionlog.php            |  7 +++++++
 resources/views/dashboard.blade.php | 13 ++++++-------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/app/Models/Actionlog.php b/app/Models/Actionlog.php
index 65698561bd..75f831d0d3 100755
--- a/app/Models/Actionlog.php
+++ b/app/Models/Actionlog.php
@@ -85,6 +85,13 @@ class Actionlog extends Model implements ICompanyableChild
                     ->withTrashed();
     }
 
+    public function userasassetlog()
+    {
+
+        return $this->belongsTo('\App\Models\User', 'asset_id')
+            ->withTrashed();
+    }
+
     public function childlogs()
     {
 
diff --git a/resources/views/dashboard.blade.php b/resources/views/dashboard.blade.php
index 53df8bd1e2..e8d78fc37d 100755
--- a/resources/views/dashboard.blade.php
+++ b/resources/views/dashboard.blade.php
@@ -140,7 +140,7 @@
                             {{ strtolower(trans('general.'.str_replace(' ','_',$activity->action_type))) }}
                         </td>
                        <td>
-                            @if (($activity->assetlog) && ($activity->asset_type=="hardware"))
+                           @if (($activity->assetlog) && ($activity->asset_type=="hardware"))
                               <a href="{{ route('view/hardware', $activity->asset_id) }}">{{ $activity->assetlog->showAssetName() }}</a>
                             @elseif (($activity->licenselog) && ($activity->asset_type=="software"))
                               <a href="{{ route('view/license', $activity->asset_id) }}">{{ $activity->licenselog->name }}</a>
@@ -150,18 +150,17 @@
                               <a href="{{ route('view/accessory', $activity->accessory_id) }}">{{ $activity->accessorylog->name }}</a>
                             @elseif (($activity->componentlog) && ($activity->asset_type=="component"))
                                <a href="{{ route('view/component', $activity->component_id) }}">{{ $activity->componentlog->name }}</a>
-                            @elseif (($activity->assetlog) && ($activity->action_type=="uploaded"))
+                            @elseif (($activity->assetlog) && ($activity->action_type=="uploaded") && ($activity->asset_type=="hardware"))
                                    <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
 
                             </td>
 
                        <td>
-                        @if (($activity->componentlog) && ($activity->asset_type=="component"))
+                        @if (($activity->userasassetlog) && ($activity->action_type=="uploaded") && ($activity->asset_type=="user"))
+                            <a href="{{ route('view/user', $activity->asset_id) }}">{{ $activity->userasassetlog->fullName() }}</a>
+                        @elseif (($activity->componentlog) && ($activity->asset_type=="component"))
                            <a href="{{ route('view/hardware', $activity->asset_id) }}">{{ $activity->assetlog->showAssetName() }}</a>
                         @elseif($activity->action_type=='requested')
                             @if ($activity->adminlog)