From 0d6fd2643dcfe5fd56c141e800a0b7c43248ca83 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Fri, 5 Jul 2024 05:59:39 +0100
Subject: [PATCH] More tweaks to the form request

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

diff --git a/app/Http/Requests/StoreAssetModelRequest.php b/app/Http/Requests/StoreAssetModelRequest.php
index 052f23f5a5..635d45cf89 100644
--- a/app/Http/Requests/StoreAssetModelRequest.php
+++ b/app/Http/Requests/StoreAssetModelRequest.php
@@ -21,11 +21,11 @@ class StoreAssetModelRequest extends ImageUploadRequest
     {
 
         if ($this->category_id) {
-            $this->category_type = Category::find($this->category_id)->category_type;
-
-            $this->merge([
-                'category_type' => $this->category_type,
-            ]);
+            if ($category = Category::find($this->category_id)) {
+                $this->merge([
+                    'category_type' => $category->category_type ?? null,
+                ]);
+            }
         }
 
     }
@@ -48,4 +48,9 @@ class StoreAssetModelRequest extends ImageUploadRequest
         $messages = ['category_type.in' => trans('admin/models/message.invalid_category_type')];
         return $messages;
     }
+
+    public function response(array $errors)
+    {
+        return $this->redirector->back()->withInput()->withErrors($errors, $this->errorBag);
+    }
 }