From ec8cb1b09ee02203a5959a657ed6b21481880560 Mon Sep 17 00:00:00 2001 From: Ivan Nieto Vivanco Date: Mon, 10 Jul 2023 16:34:00 -0600 Subject: [PATCH] Add the withTrashed() method to requestingUser() method in CheckoutRequest model, so the view of requestable assets doesn't crash --- app/Models/CheckoutRequest.php | 2 +- resources/views/hardware/requested.blade.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Models/CheckoutRequest.php b/app/Models/CheckoutRequest.php index 26abdd301..b717a332a 100644 --- a/app/Models/CheckoutRequest.php +++ b/app/Models/CheckoutRequest.php @@ -18,7 +18,7 @@ class CheckoutRequest extends Model public function requestingUser() { - return $this->user()->first(); + return $this->user()->withTrashed()->first(); } public function requestedItem() diff --git a/resources/views/hardware/requested.blade.php b/resources/views/hardware/requested.blade.php index da90b3bf2..dcc8a0193 100644 --- a/resources/views/hardware/requested.blade.php +++ b/resources/views/hardware/requested.blade.php @@ -89,7 +89,7 @@ @endif - @if ($request->requestingUser()) + @if ($request->requestingUser() && !$request->requestingUser()->trashed()) {{ $request->requestingUser()->present()->fullName() }}