From a7eb89f6b6086fa22e3ff4ec35f3fc97362ce130 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 16 Jun 2020 16:06:25 -0700 Subject: [PATCH] Misc fixes for flysystem paths --- .../Accessories/AccessoriesController.php | 2 +- .../Controllers/Assets/AssetsController.php | 2 ++ app/Http/Requests/ImageUploadRequest.php | 25 +++++++++++-------- .../Transformers/AccessoriesTransformer.php | 2 +- app/Providers/SettingsServiceProvider.php | 2 +- database/seeds/AssetSeeder.php | 2 +- resources/views/accessories/edit.blade.php | 2 +- 7 files changed, 22 insertions(+), 15 deletions(-) diff --git a/app/Http/Controllers/Accessories/AccessoriesController.php b/app/Http/Controllers/Accessories/AccessoriesController.php index 19b204b153..3f4d866beb 100755 --- a/app/Http/Controllers/Accessories/AccessoriesController.php +++ b/app/Http/Controllers/Accessories/AccessoriesController.php @@ -79,7 +79,7 @@ class AccessoriesController extends Controller $accessory->user_id = Auth::user()->id; $accessory->supplier_id = request('supplier_id'); - $accessory = $request->handleImages($accessory); + $accessory = $request->handleImages($accessory, 500, 'image', 'public/uploads'); // Was the accessory created? if ($accessory->save()) { diff --git a/app/Http/Controllers/Assets/AssetsController.php b/app/Http/Controllers/Assets/AssetsController.php index c6228d67d1..aa64f6463c 100755 --- a/app/Http/Controllers/Assets/AssetsController.php +++ b/app/Http/Controllers/Assets/AssetsController.php @@ -107,6 +107,8 @@ class AssetsController extends Controller // differently $asset_tags = $request->input('asset_tags'); + $settings = Setting::getSettings(); + $success = false; $serials = $request->input('serials'); diff --git a/app/Http/Requests/ImageUploadRequest.php b/app/Http/Requests/ImageUploadRequest.php index e72bfde3a5..50d9b8a8c7 100644 --- a/app/Http/Requests/ImageUploadRequest.php +++ b/app/Http/Requests/ImageUploadRequest.php @@ -45,11 +45,12 @@ class ImageUploadRequest extends Request */ public function handleImages($item, $w = 550, $fieldname = 'image', $path = null) { - + \Log::debug('Handle file upload'); $type = strtolower(class_basename(get_class($item))); if (is_null($path)) { - $path = str_plural($type); + $path = 'public/uploads/'.str_plural($type); + \Log::info('Path is: '.$path); } \Log::debug('Image path is: '.$path); @@ -62,22 +63,26 @@ class ImageUploadRequest extends Request if (!config('app.lock_passwords')) { - if (!Storage::disk('public')->exists($path)) Storage::disk('public')->makeDirectory($path, 775); + if (!Storage::disk('public')->exists($path)) + { + \Log::debug($path); + // Storage::disk('public')->makeDirectory($path, 775); + } if (!is_dir($path)) { - \Log::debug($path.' does not exist'); - mkdir($path); + \Log::info($path.' does not exist'); + //mkdir($path); } $image = $this->file($fieldname); $ext = $image->getClientOriginalExtension(); $file_name = $type.'-'.str_random(18).'.'.$ext; - \Log::debug('File name will be: '.$file_name); + \Log::info('File name will be: '.$file_name); if ($image->getClientOriginalExtension()!=='svg') { - \Log::debug('Not an SVG - resize'); - \Log::debug('Trying to upload to: '.$path.'/'.$file_name); + \Log::info('Not an SVG - resize'); + \Log::info('Trying to upload to: '.$path.'/'.$file_name); $upload = Image::make($image->getRealPath())->resize(null, $w, function ($constraint) { $constraint->aspectRatio(); $constraint->upsize(); @@ -88,13 +93,13 @@ class ImageUploadRequest extends Request // If the file is an SVG, we need to clean it and NOT encode it } else { - \Log::debug('This is an SVG'); + \Log::info('This is an SVG'); $sanitizer = new Sanitizer(); $dirtySVG = file_get_contents($image->getRealPath()); $cleanSVG = $sanitizer->sanitize($dirtySVG); try { - \Log::debug('Trying to upload to: '.$path.'/'.$file_name); + \Log::info('Trying to upload to: '.$path.'/'.$file_name); Storage::disk('public')->put($path.'/'.$file_name, $cleanSVG); } catch (\Exception $e) { \Log::debug($e); diff --git a/app/Http/Transformers/AccessoriesTransformer.php b/app/Http/Transformers/AccessoriesTransformer.php index 8b56ae05f6..b06b6bb804 100644 --- a/app/Http/Transformers/AccessoriesTransformer.php +++ b/app/Http/Transformers/AccessoriesTransformer.php @@ -24,7 +24,7 @@ class AccessoriesTransformer $array = [ 'id' => $accessory->id, 'name' => e($accessory->name), - 'image' => ($accessory->image) ? Storage::disk('public')->url('accessories/'.e($accessory->image)) : null, + 'image' => ($accessory->image) ? Storage::disk('public')->url('uploads/accessories/'.e($accessory->image)) : null, 'company' => ($accessory->company) ? ['id' => $accessory->company->id,'name'=> e($accessory->company->name)] : null, 'manufacturer' => ($accessory->manufacturer) ? ['id' => $accessory->manufacturer->id,'name'=> e($accessory->manufacturer->name)] : null, 'supplier' => ($accessory->supplier) ? ['id' => $accessory->supplier->id,'name'=> e($accessory->supplier->name)] : null, diff --git a/app/Providers/SettingsServiceProvider.php b/app/Providers/SettingsServiceProvider.php index 3e0246ab32..0a9586173d 100644 --- a/app/Providers/SettingsServiceProvider.php +++ b/app/Providers/SettingsServiceProvider.php @@ -45,7 +45,7 @@ class SettingsServiceProvider extends ServiceProvider }); \App::singleton('accessories_upload_path', function() { - return 'accessories/'; + return 'public/uploads/accessories/'; }); \App::singleton('models_upload_path', function(){ diff --git a/database/seeds/AssetSeeder.php b/database/seeds/AssetSeeder.php index f9c2f1fc83..9bb9fd75db 100644 --- a/database/seeds/AssetSeeder.php +++ b/database/seeds/AssetSeeder.php @@ -35,7 +35,7 @@ class AssetSeeder extends Seeder factory(Asset::class, 10)->states('ultrasharp')->create(); - $del_files = Storage::files('companies'); + $del_files = Storage::files('assets'); foreach($del_files as $del_file){ // iterate files \Log::debug('Deleting: '.$del_files); try { diff --git a/resources/views/accessories/edit.blade.php b/resources/views/accessories/edit.blade.php index d125f81449..a8c27ff0d5 100755 --- a/resources/views/accessories/edit.blade.php +++ b/resources/views/accessories/edit.blade.php @@ -29,7 +29,7 @@
{{ Form::checkbox('image_delete') }} - + {!! $errors->first('image_delete', '') !!}