From ae505ef44ddb3217874e78ee45dae1b424346d3c Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 31 Aug 2022 19:20:35 -0700
Subject: [PATCH 1/2] Literally have no idea how this ever worked

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Http/Controllers/ReportsController.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php
index 57dd87d81..c2e5ad789 100644
--- a/app/Http/Controllers/ReportsController.php
+++ b/app/Http/Controllers/ReportsController.php
@@ -757,7 +757,7 @@ class ReportsController extends Controller
                     if ($request->filled('username')) {
                         // Only works if we're checked out to a user, not anything else.
                         if ($asset->checkedOutToUser()) {
-                            $row[] = ($asset->assignedto) ? $asset->assignedto->username : '';
+                            $row[] = ($asset->assignedTo) ? $asset->assignedTo->username : '';
                         } else {
                             $row[] = ''; // Empty string if unassigned
                         }
@@ -766,7 +766,7 @@ class ReportsController extends Controller
                     if ($request->filled('employee_num')) {
                         // Only works if we're checked out to a user, not anything else.
                         if ($asset->checkedOutToUser()) {
-                            $row[] = ($asset->assignedto) ? $asset->assignedto->employee_num : '';
+                            $row[] = ($asset->assignedTo) ? $asset->assignedTo->employee_num : '';
                         } else {
                             $row[] = ''; // Empty string if unassigned
                         }
@@ -774,7 +774,7 @@ class ReportsController extends Controller
 
                     if ($request->filled('manager')) {
                         if ($asset->checkedOutToUser()) {
-                            $row[] = (($asset->assignedto) && ($asset->assignedto->manager)) ? $asset->assignedto->manager->present()->fullName : '';
+                            $row[] = (($asset->assignedTo) && ($asset->assignedTo->manager)) ? $asset->assignedTo->manager->present()->fullName : '';
                         } else {
                             $row[] = ''; // Empty string if unassigned
                         }
@@ -782,7 +782,7 @@ class ReportsController extends Controller
 
                     if ($request->filled('department')) {
                         if ($asset->checkedOutToUser()) {
-                            $row[] = (($asset->assignedto) && ($asset->assignedto->department)) ? $asset->assignedto->department->name : '';
+                            $row[] = (($asset->assignedTo) && ($asset->assignedTo->department)) ? $asset->assignedTo->department->name : '';
                         } else {
                             $row[] = ''; // Empty string if unassigned
                         }
@@ -790,7 +790,7 @@ class ReportsController extends Controller
 
                     if ($request->filled('title')) {
                         if ($asset->checkedOutToUser()) {
-                            $row[] = ($asset->assignedto) ? $asset->assignedto->jobtitle : '';
+                            $row[] = ($asset->assignedTo) ? $asset->assignedTo->jobtitle : '';
                         } else {
                             $row[] = ''; // Empty string if unassigned
                         }

From a930661150b22401884f221cda35096ee89b0f74 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Mon, 31 Oct 2022 12:16:39 -0700
Subject: [PATCH 2/2] Check for valid category

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/account/view-assets.blade.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/resources/views/account/view-assets.blade.php b/resources/views/account/view-assets.blade.php
index a83be1775..6081091c2 100755
--- a/resources/views/account/view-assets.blade.php
+++ b/resources/views/account/view-assets.blade.php
@@ -421,7 +421,11 @@
                             <img src="{{ Storage::disk('public')->url(app('models_upload_path').e($asset->model->image)) }}" style="max-height: 30px; width: auto" class="img-responsive">
                           @endif
                         </td>
-                        <td>{{ $asset->model->category->name }}</td>
+                        <td>
+                          @if (($asset->model) && ($asset->model->category))
+                          {{ $asset->model->category->name }}
+                          @endif
+                        </td>
                         <td>{{ $asset->asset_tag }}</td>
                         <td>{{ $asset->name }}</td>
                         <td>