From 8310b91e0015b02b0fcc76983e53ec67f79db4ee Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 15 May 2024 15:43:38 +0100 Subject: [PATCH] Use UploadFileRequest for audit files Signed-off-by: snipe --- .../Controllers/Assets/AssetsController.php | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/app/Http/Controllers/Assets/AssetsController.php b/app/Http/Controllers/Assets/AssetsController.php index c1386f81f1..734314b112 100755 --- a/app/Http/Controllers/Assets/AssetsController.php +++ b/app/Http/Controllers/Assets/AssetsController.php @@ -6,7 +6,7 @@ use App\Helpers\Helper; use App\Http\Controllers\Controller; use App\Http\Requests\ImageUploadRequest; use App\Models\Actionlog; -use App\Models\Manufacturer; +use App\Http\Requests\UploadFileRequest; use Illuminate\Support\Facades\Log; use App\Models\Asset; use App\Models\AssetModel; @@ -863,7 +863,7 @@ class AssetsController extends Controller } - public function auditStore(Request $request, $id) + public function auditStore(UploadFileRequest $request, $id) { $this->authorize('audit', Asset::class); @@ -895,20 +895,11 @@ class AssetsController extends Controller if ($asset->isValid() && $asset->save()) { - $file_name = ''; - // Upload an image, if attached + // Create the image (if one was chosen.) if ($request->hasFile('image')) { - $path = 'private_uploads/audits'; - if (! Storage::exists($path)) { - Storage::makeDirectory($path, 775); - } - $upload = $image = $request->file('image'); - $ext = $image->getClientOriginalExtension(); - $file_name = 'audit-'.str_random(18).'.'.$ext; - Storage::putFileAs($path, $upload, $file_name); + $file_name = $request->handleFile('private_uploads/audits/', 'audit-'.$asset->id, $request->file('image')); } - $asset->logAudit($request->input('note'), $request->input('location_id'), $file_name); return redirect()->route('assets.audit.due')->with('success', trans('admin/hardware/message.audit.success')); }