From 5aeac3c9e0f7de5abba26fb1d1fbc11410418456 Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 24 Aug 2020 14:30:43 -0700 Subject: [PATCH 1/7] Fixed parse error --- app/Http/Transformers/DepartmentsTransformer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Transformers/DepartmentsTransformer.php b/app/Http/Transformers/DepartmentsTransformer.php index 5429ba684..12cd99e46 100644 --- a/app/Http/Transformers/DepartmentsTransformer.php +++ b/app/Http/Transformers/DepartmentsTransformer.php @@ -48,7 +48,7 @@ class DepartmentsTransformer $permissions_array['available_actions'] = [ 'update' => Gate::allows('update', Department::class), - 'delete' => (Gate::allows('delete', Department::class) && ($department->users_count==0), + 'delete' => (Gate::allows('delete', Department::class) && ($department->users_count==0)), ]; $array += $permissions_array; From 232e3f30aa02f34de2be9b8c0fbe05c2de3d5631 Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 24 Aug 2020 14:30:55 -0700 Subject: [PATCH 2/7] =?UTF-8?q?Fixed=20accessories=20=E2=80=9Ccurrent=20im?= =?UTF-8?q?age=E2=80=9D=20path=20in=20edit=20form?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/views/accessories/edit.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/accessories/edit.blade.php b/resources/views/accessories/edit.blade.php index a8c27ff0d..9854f6a76 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', '') !!}
From b97ff4e907596c53d5c3957564324fbd4f36cfd1 Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 24 Aug 2020 15:10:26 -0700 Subject: [PATCH 3/7] Fixed Depts uploads --- app/Http/Controllers/DepartmentsController.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/DepartmentsController.php b/app/Http/Controllers/DepartmentsController.php index c3392422d..b0d7768b0 100644 --- a/app/Http/Controllers/DepartmentsController.php +++ b/app/Http/Controllers/DepartmentsController.php @@ -55,7 +55,7 @@ class DepartmentsController extends Controller $department->user_id = Auth::user()->id; $department->manager_id = ($request->filled('manager_id' ) ? $request->input('manager_id') : null); - $department = $request->handleImages($department,600, public_path().'/uploads/departments'); + $department = $request->handleImages($department); if ($department->save()) { return redirect()->route("departments.index")->with('success', trans('admin/departments/message.create.success')); @@ -169,8 +169,8 @@ class DepartmentsController extends Controller $department->fill($request->all()); $department->manager_id = ($request->filled('manager_id' ) ? $request->input('manager_id') : null); - $department = $request->handleImages($department,600, public_path().'/uploads/departments'); - + $department = $request->handleImages($department); + if ($department->save()) { return redirect()->route("departments.index")->with('success', trans('admin/departments/message.update.success')); } From 041fc20955be6f4928e72306e49a18df7f846980 Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 24 Aug 2020 15:43:11 -0700 Subject: [PATCH 4/7] Fixed Companies and Categories uploads --- app/Http/Controllers/CategoriesController.php | 5 ++--- app/Http/Controllers/CompaniesController.php | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/CategoriesController.php b/app/Http/Controllers/CategoriesController.php index 2383dc553..244a687ed 100755 --- a/app/Http/Controllers/CategoriesController.php +++ b/app/Http/Controllers/CategoriesController.php @@ -76,8 +76,7 @@ class CategoriesController extends Controller $category->checkin_email = $request->input('checkin_email', '0'); $category->user_id = Auth::id(); - $category = $request->handleImages($category,600, public_path().'/uploads/categories'); - + $category = $request->handleImages($category); if ($category->save()) { return redirect()->route('categories.index')->with('success', trans('admin/categories/message.create.success')); } @@ -136,7 +135,7 @@ class CategoriesController extends Controller $category->checkin_email = $request->input('checkin_email', '0'); - $category = $request->handleImages($category,600, public_path().'/uploads/categories'); + $category = $request->handleImages($category); if ($category->save()) { // Redirect to the new category page diff --git a/app/Http/Controllers/CompaniesController.php b/app/Http/Controllers/CompaniesController.php index 369672354..fbb5754a5 100644 --- a/app/Http/Controllers/CompaniesController.php +++ b/app/Http/Controllers/CompaniesController.php @@ -62,7 +62,7 @@ final class CompaniesController extends Controller $company = new Company; $company->name = $request->input('name'); - $company = $request->handleImages($company,600, public_path().'/uploads/companies'); + $company = $request->handleImages($company); if ($company->save()) { return redirect()->route('companies.index') @@ -114,7 +114,7 @@ final class CompaniesController extends Controller $company->name = $request->input('name'); - $company = $request->handleImages($company,600, public_path().'/uploads/companies'); + $company = $request->handleImages($company); if ($company->save()) { From 66686f80803e043bf3614ebb3381cb398f043ba0 Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 24 Aug 2020 18:32:15 -0700 Subject: [PATCH 5/7] Added some debugging - will remove at RC --- app/Http/Requests/ImageUploadRequest.php | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/app/Http/Requests/ImageUploadRequest.php b/app/Http/Requests/ImageUploadRequest.php index 9f1d04b8e..acf51970b 100644 --- a/app/Http/Requests/ImageUploadRequest.php +++ b/app/Http/Requests/ImageUploadRequest.php @@ -121,13 +121,17 @@ class ImageUploadRequest extends Request } // If the user isn't uploading anything new but wants to delete their old image, do so - } elseif ($this->input('image_delete')=='1') { + } else { + \Log::debug('No image was passed - not sure what to do now.'); + if ($this->input('image_delete')=='1') { - try { - Storage::disk('public')->delete($path.'/'.$item->{$fieldname}); - $item->{$fieldname} = null; - } catch (\Exception $e) { - \Log::debug($e); + + try { + Storage::disk('public')->delete($path . '/' . $item->{$fieldname}); + $item->{$fieldname} = null; + } catch (\Exception $e) { + \Log::debug($e); + } } } From e5dd6035b9ec472bd7f05e81d9fca75a2602cb7d Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 24 Aug 2020 18:32:40 -0700 Subject: [PATCH 6/7] Fixed the other upload handleUploads signatures --- app/Http/Controllers/LocationsController.php | 4 ++-- app/Http/Controllers/SuppliersController.php | 4 ++-- app/Http/Controllers/Users/UsersController.php | 6 ++++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/Http/Controllers/LocationsController.php b/app/Http/Controllers/LocationsController.php index 41263efd7..b78ba7513 100755 --- a/app/Http/Controllers/LocationsController.php +++ b/app/Http/Controllers/LocationsController.php @@ -81,7 +81,7 @@ class LocationsController extends Controller $location->manager_id = $request->input('manager_id'); $location->user_id = Auth::id(); - $location = $request->handleImages($location,600, public_path().'/uploads/locations'); + $location = $request->handleImages($location); if ($location->save()) { return redirect()->route("locations.index")->with('success', trans('admin/locations/message.create.success')); @@ -146,7 +146,7 @@ class LocationsController extends Controller $location->ldap_ou = $request->input('ldap_ou'); $location->manager_id = $request->input('manager_id'); - $location = $request->handleImages($location,600, public_path().'/uploads/locations'); + $location = $request->handleImages($location); if ($location->save()) { diff --git a/app/Http/Controllers/SuppliersController.php b/app/Http/Controllers/SuppliersController.php index d82dca4d8..41ff45679 100755 --- a/app/Http/Controllers/SuppliersController.php +++ b/app/Http/Controllers/SuppliersController.php @@ -69,7 +69,7 @@ class SuppliersController extends Controller $supplier->notes = request('notes'); $supplier->url = $supplier->addhttp(request('url')); $supplier->user_id = Auth::id(); - $supplier = $request->handleImages($supplier,600, public_path().'/uploads/suppliers'); + $supplier = $request->handleImages($supplier); if ($supplier->save()) { @@ -129,7 +129,7 @@ class SuppliersController extends Controller $supplier->email = request('email'); $supplier->url = $supplier->addhttp(request('url')); $supplier->notes = request('notes'); - $supplier = $request->handleImages($supplier,600, public_path().'/uploads/suppliers'); + $supplier = $request->handleImages($supplier); if ($supplier->save()) { return redirect()->route('suppliers.index')->with('success', trans('admin/suppliers/message.update.success')); diff --git a/app/Http/Controllers/Users/UsersController.php b/app/Http/Controllers/Users/UsersController.php index 0e1953f02..2e1c7ca31 100755 --- a/app/Http/Controllers/Users/UsersController.php +++ b/app/Http/Controllers/Users/UsersController.php @@ -126,7 +126,9 @@ class UsersController extends Controller } $user->permissions = json_encode($permissions_array); - app('App\Http\Requests\ImageUploadRequest')->handleImages($user, '', 'avatar', 'avatars'); + + // we have to invoke the + app('App\Http\Requests\ImageUploadRequest')->handleImages($user); if ($user->save()) { if ($request->filled('groups')) { @@ -288,7 +290,7 @@ class UsersController extends Controller $user->permissions = json_encode($permissions_array); - app('App\Http\Requests\ImageUploadRequest')->handleImages($user, '', 'avatar', 'avatars'); + app('App\Http\Requests\ImageUploadRequest')->handleImages($user); // Was the user updated? From a90d2ba077e2b2bc7355d05faff2f94e352ff232 Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 24 Aug 2020 18:53:33 -0700 Subject: [PATCH 7/7] Fixed suppliers upload --- resources/views/suppliers/edit.blade.php | 35 ++++++++++-------------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/resources/views/suppliers/edit.blade.php b/resources/views/suppliers/edit.blade.php index ac85915aa..3e92265b5 100755 --- a/resources/views/suppliers/edit.blade.php +++ b/resources/views/suppliers/edit.blade.php @@ -44,28 +44,21 @@ @include ('partials.forms.edit.notes') -@if ($item->image) - -
- -
- {{ Form::checkbox('image_delete') }} - - {!! $errors->first('image_delete', '') !!} +@if (($item->image) && ($item->image!='')) +
+ +
+ +
+ Image for {{ $item->name }} + {!! $errors->first('image_delete', '') !!} +
-
+ + @endif -
- -
- -

Accepted filetypes are jpg, png, gif and svg

- {!! $errors->first('image', '') !!} -
-
- +@include ('partials.forms.edit.image-upload') @stop