From b8cbf0022e1dba08fc13be0e70623d241c2aa02f Mon Sep 17 00:00:00 2001
From: Daniel Meltzer <parallelgrapefruit@gmail.com>
Date: Thu, 24 Nov 2016 14:48:14 -0600
Subject: [PATCH] Log fixes (#2972)

* Make sure we set target_type when creating an accept asset log, and add a migration to fix older ones.

* On a declined log, we don't have an assigned user.

 Guard against this conditional (which realistically should never be hit?)
Should fix #2940

* Fix codacy issues with migration.
---
 app/Http/Controllers/ViewAssetsController.php |  1 +
 ..._add_missing_target_type_to_logs_table.php | 32 +++++++++++++++++++
 resources/views/hardware/view.blade.php       |  7 +++-
 3 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 database/migrations/2016_11_24_160405_add_missing_target_type_to_logs_table.php

diff --git a/app/Http/Controllers/ViewAssetsController.php b/app/Http/Controllers/ViewAssetsController.php
index 6febfd5f8e..acbe21b929 100755
--- a/app/Http/Controllers/ViewAssetsController.php
+++ b/app/Http/Controllers/ViewAssetsController.php
@@ -379,6 +379,7 @@ class ViewAssetsController extends Controller
         }
 
         $logaction->target_id = $findlog->target_id;
+        $logaction->target_type = User::class;
         $logaction->note = e(Input::get('note'));
         $logaction->updated_at = date("Y-m-d H:i:s");
 
diff --git a/database/migrations/2016_11_24_160405_add_missing_target_type_to_logs_table.php b/database/migrations/2016_11_24_160405_add_missing_target_type_to_logs_table.php
new file mode 100644
index 0000000000..c71d3b4e30
--- /dev/null
+++ b/database/migrations/2016_11_24_160405_add_missing_target_type_to_logs_table.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
+
+class AddMissingTargetTypeToLogsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        // Get list of action logs with a target id but not a target type.  This fixes missing target_type in accept_asset
+        DB::table('action_logs')->where('target_type', null)->where(function($query) {
+            $query->where('action_type', 'accepted')
+            ->orWhere('action_type', 'declined');
+        })->update(['target_type'=> 'App\Models\User']);
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        // Nothing to do.
+    }
+}
diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
index 2519168f21..27a4195740 100755
--- a/resources/views/hardware/view.blade.php
+++ b/resources/views/hardware/view.blade.php
@@ -212,7 +212,7 @@
                       </tr>
                     @endif
 
-                    @if ($asset->supplier_id)
+                    @if ($asset->supplier)
                       <tr>
                         <td>{{ trans('admin/hardware/form.supplier') }}</td>
                         <td>
@@ -615,7 +615,12 @@
                                 <del>{{ $log->target->showAssetName() }}</del>
                               @endif
                             @elseif (($log->action_type=='accepted') || ($log->action_type=='declined'))
+                                {{-- On a declined log, the asset isn't assigned to anyone when we look this up. --}}
+                                @if ($log->item->assigneduser)
                                     {{ $log->item->assigneduser->fullName() }}
+                                @else
+                                    Unknown
+                                @endif
                             @else
 
                               Deleted User