From ea84728a3f9dbda3129f25bc761340405726f708 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sun, 10 Aug 2025 17:58:11 +0100
Subject: [PATCH] Rename models uploads dir

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Http/Controllers/Api/UploadedFilesController.php |  2 +-
 app/Http/Controllers/UploadedFilesController.php     |  2 +-
 app/Http/Requests/ImageUploadRequest.php             | 10 +++++-----
 app/Models/Actionlog.php                             |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/Http/Controllers/Api/UploadedFilesController.php b/app/Http/Controllers/Api/UploadedFilesController.php
index ca507d1b51..b5d729f671 100644
--- a/app/Http/Controllers/Api/UploadedFilesController.php
+++ b/app/Http/Controllers/Api/UploadedFilesController.php
@@ -50,7 +50,7 @@ class UploadedFilesController extends Controller
         'hardware' => 'private_uploads/assets/',
         'licenses' => 'private_uploads/licenses/',
         'locations' => 'private_uploads/locations/',
-        'models' => 'private_uploads/assetmodels/',
+        'models' => 'private_uploads/models/',
         'users' => 'private_uploads/users/',
     ];
 
diff --git a/app/Http/Controllers/UploadedFilesController.php b/app/Http/Controllers/UploadedFilesController.php
index bce40f7787..f0dad12e10 100644
--- a/app/Http/Controllers/UploadedFilesController.php
+++ b/app/Http/Controllers/UploadedFilesController.php
@@ -53,7 +53,7 @@ class UploadedFilesController extends Controller
         'hardware' => 'private_uploads/assets/',
         'licenses' => 'private_uploads/licenses/',
         'locations' => 'private_uploads/locations/',
-        'models' => 'private_uploads/assetmodels/',
+        'models' => 'private_uploads/models/',
         'users' => 'private_uploads/users/',
     ];
 
diff --git a/app/Http/Requests/ImageUploadRequest.php b/app/Http/Requests/ImageUploadRequest.php
index 52d61d5bd3..add54aadf4 100644
--- a/app/Http/Requests/ImageUploadRequest.php
+++ b/app/Http/Requests/ImageUploadRequest.php
@@ -71,20 +71,20 @@ class ImageUploadRequest extends Request
     public function handleImages($item, $w = 600, $form_fieldname = 'image', $path = null, $db_fieldname = 'image')
     {
 
-        $type = Str::snake(class_basename(get_class($item)));
+        $type = class_basename(get_class($item));
 
         if (is_null($path)) {
+            
+            $path = Str::of(str_plural($type));
 
-            \Log::debug('path is null');
-            $path = Str::of(str_plural($type))->snake();
-
-            if ($type == 'assetmodel') {
+            if ($type == 'AssetModel') {
                 $path = 'models';
             }
 
             if ($type == 'user') {
                 $path = 'avatars';
             }
+
         }
 
 
diff --git a/app/Models/Actionlog.php b/app/Models/Actionlog.php
index ed485c910b..bc1b5c72a2 100755
--- a/app/Models/Actionlog.php
+++ b/app/Models/Actionlog.php
@@ -491,7 +491,7 @@ class Actionlog extends SnipeModel
         case Asset::class:
             return 'private_uploads/assets/'.$this->filename;
         case AssetModel::class:
-            return 'private_uploads/assetmodels/'.$this->filename;
+            return 'private_uploads/models/'.$this->filename;
         case Consumable::class:
             return 'private_uploads/consumables/'.$this->filename;
         case Component::class: