From fbaf6e2494a42118b4b155813f4f56d7e725be6c Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Mon, 16 Nov 2020 16:39:02 -0800
Subject: [PATCH] Fixed  #8747 - upload path for uploaded images

---
 app/Http/Requests/ImageUploadRequest.php |  3 +--
 resources/views/hardware/view.blade.php  | 14 +++++---------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/app/Http/Requests/ImageUploadRequest.php b/app/Http/Requests/ImageUploadRequest.php
index 73518880d6..2b43f9194d 100644
--- a/app/Http/Requests/ImageUploadRequest.php
+++ b/app/Http/Requests/ImageUploadRequest.php
@@ -49,8 +49,7 @@ class ImageUploadRequest extends Request
         $type = strtolower(class_basename(get_class($item)));
 
         if (is_null($path)) {
-            $path = 'uploads/';
-            $path .= str_plural($type);
+            $path = str_plural($type);
 
             if ($type == 'assetmodel') {
                 $path =  'models';
diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
index e5e5be6a85..38108ee4a6 100755
--- a/resources/views/hardware/view.blade.php
+++ b/resources/views/hardware/view.blade.php
@@ -729,16 +729,12 @@
 
                             <div class="col-md-4">
 
-                                @if ($asset->image)
+                                @if (($asset->image) || (($asset->model) && ($asset->model->image!='')))
+
+
                                     <div class="col-md-12 text-center" style="padding-bottom: 15px;">
-                                        <a href="{{ Storage::disk('public')->url('uploads/assets/'. $asset->image) }}" data-toggle="lightbox">
-                                            <img src="{{ Storage::disk('public')->url('uploads/assets/'. $asset->image) }}" class="assetimg img-responsive" alt="{{ $asset->getDisplayNameAttribute() }}">
-                                        </a>
-                                    </div>
-                                @elseif (($asset->model) && ($asset->model->image!=''))
-                                    <div class="col-md-12 text-center" style="padding-bottom: 15px;">
-                                        <a href="{{ Storage::disk('public')->url('uploads/models/'.$asset->model->image) }}" data-toggle="lightbox">
-                                            <img src="{{ Storage::disk('public')->url('uploads/models/'.$asset->model->image) }}" class="assetimg img-responsive" alt="{{ $asset->getDisplayNameAttribute() }}">
+                                        <a href="{{ ($asset->getImageUrl()) ? $asset->getImageUrl() : null }}" data-toggle="lightbox">
+                                            <img src="{{ ($asset->getImageUrl()) ? $asset->getImageUrl() : null }}" class="assetimg img-responsive" alt="{{ $asset->getDisplayNameAttribute() }}">
                                         </a>
                                     </div>
                                 @endif