From 4aded5e117d44ddd3ca72c5f06cf923e7809552c Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 14 Nov 2022 22:01:33 +0000 Subject: [PATCH 1/2] FIxed 500 error if model files are missing Signed-off-by: snipe --- resources/views/models/view.blade.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/resources/views/models/view.blade.php b/resources/views/models/view.blade.php index fe6ab3d0cf06..445b90b7e82e 100755 --- a/resources/views/models/view.blade.php +++ b/resources/views/models/view.blade.php @@ -145,17 +145,21 @@ class="table table-striped snipe-table" - @if ( Helper::checkUploadIsImage($file->get_src('assetmodels'))) + @if ((Storage::exists('private_uploads/assetmodels/'.$file->filename)) && ( Helper::checkUploadIsImage($file->get_src('assetmodels')))) @endif - {{ $file->filename }} + @if (Storage::exists('private_uploads/assetmodels/'.$file->filename)) + {{ $file->filename }} + @else + {{ $file->filename }} + @endif - - {{ Helper::formatFilesizeUnits(Storage::size('private_uploads/assetmodels/'.$file->filename)) }} + + {{ (Storage::exists('private_uploads/assetmodels/'.$file->filename)) ? Helper::formatFilesizeUnits(Storage::size('private_uploads/assetmodels/'.$file->filename)) : '' }} @if ($file->note) From d4ac7530b634ce58c0023ee025988ccef5b935ca Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 14 Nov 2022 22:04:06 +0000 Subject: [PATCH 2/2] =?UTF-8?q?Removed=20download=20button=20for=20files?= =?UTF-8?q?=20that=20don=E2=80=99t=20exist=20on=20the=20server?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: snipe --- resources/views/models/view.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/models/view.blade.php b/resources/views/models/view.blade.php index 445b90b7e82e..3b9078d29cb9 100755 --- a/resources/views/models/view.blade.php +++ b/resources/views/models/view.blade.php @@ -167,7 +167,7 @@ class="table table-striped snipe-table" @endif - @if ($file->filename) + @if (($file->filename) && (Storage::exists('private_uploads/assetmodels/'.$file->filename)))