From 16fcc6dc444b20c28aab9432f2ba620a69f38978 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 7 Feb 2023 18:40:00 -0800
Subject: [PATCH] Fixed UI bug where download button was missing for non-images

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/lang/en/general.php        |  1 +
 resources/views/users/view.blade.php | 12 +++++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/resources/lang/en/general.php b/resources/lang/en/general.php
index a2c7e367d9..e071124a05 100644
--- a/resources/lang/en/general.php
+++ b/resources/lang/en/general.php
@@ -396,6 +396,7 @@ return [
     'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
     'placeholder_kit'       => 'Select a kit',
     'file_not_found'        => 'File not found',
+    'preview_not_available' => '(no preview)',
 
 
 
diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php
index 3fb3b9a58c..cd9757854a 100755
--- a/resources/views/users/view.blade.php
+++ b/resources/views/users/view.blade.php
@@ -868,13 +868,15 @@
 
                             </td>
                             <td>
-                                @if ($file->filename)
-                                    @if ((Storage::exists('private_uploads/users/'.$file->filename)) && ( Helper::checkUploadIsImage($file->get_src('users'))))
+                                @if (($file->filename) && (Storage::exists('private_uploads/users/'.$file->filename)))
+                                   @if (Helper::checkUploadIsImage($file->get_src('users')))
                                         <a href="{{ route('show/userfile', ['userId' => $user->id, 'fileId' => $file->id, 'download' => 'false']) }}" data-toggle="lightbox" data-type="image"><img src="{{ route('show/userfile', ['userId' => $user->id, 'fileId' => $file->id]) }}" class="img-thumbnail" style="max-width: 50px;"></a>
                                     @else
-                                        <i class="fa fa-times text-danger" aria-hidden="true"></i>
-                                        {{ trans('general.file_not_found') }}
+                                        {{ trans('general.preview_not_available') }}
                                     @endif
+                                @else
+                                    <i class="fa fa-times text-danger" aria-hidden="true"></i>
+                                        {{ trans('general.file_not_found') }}
                                 @endif
                             </td>
                             <td>
@@ -891,7 +893,7 @@
                             </td>
                             <td>
                                 @if ($file->filename)
-                                    @if ((Storage::exists('private_uploads/users/'.$file->filename)) && ( Helper::checkUploadIsImage($file->get_src('users'))))
+                                    @if (Storage::exists('private_uploads/users/'.$file->filename))
                                         <a href="{{ route('show/userfile', [$user->id, $file->id]) }}" class="btn btn-default">
                                             <i class="fas fa-download" aria-hidden="true"></i>
                                             <span class="sr-only">{{ trans('general.download') }}</span>