lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Merge pull request #8359 from snipe/fixes/misc_flysystem_fixes

Browse source 
Misc flysystem fixes
This commit is contained in:
snipe 2020-08-24 19:28:40 -07:00 • committed by GitHub
commit 3cba174dfb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 41 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/Http/Controllers/CategoriesController.php
View file

@ -76,8 +76,7 @@ class CategoriesController extends Controller
$category->checkin_email = $request->input('checkin_email', '0'); $category->checkin_email = $request->input('checkin_email', '0');
$category->user_id = Auth::id(); $category->user_id = Auth::id();
$category = $request->handleImages($category,600, public_path().'/uploads/categories'); $category = $request->handleImages($category);
if ($category->save()) { if ($category->save()) {
return redirect()->route('categories.index')->with('success', trans('admin/categories/message.create.success')); 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->checkin_email = $request->input('checkin_email', '0');
$category = $request->handleImages($category,600, public_path().'/uploads/categories'); $category = $request->handleImages($category);
if ($category->save()) { if ($category->save()) {
// Redirect to the new category page // Redirect to the new category page

4
app/Http/Controllers/CompaniesController.php
View file

@ -62,7 +62,7 @@ final class CompaniesController extends Controller
$company = new Company; $company = new Company;
$company->name = $request->input('name'); $company->name = $request->input('name');
$company = $request->handleImages($company,600, public_path().'/uploads/companies'); $company = $request->handleImages($company);
if ($company->save()) { if ($company->save()) {
return redirect()->route('companies.index') return redirect()->route('companies.index')
@ -114,7 +114,7 @@ final class CompaniesController extends Controller
$company->name = $request->input('name'); $company->name = $request->input('name');
$company = $request->handleImages($company,600, public_path().'/uploads/companies'); $company = $request->handleImages($company);
if ($company->save()) { if ($company->save()) {

4
app/Http/Controllers/DepartmentsController.php
View file

@ -55,7 +55,7 @@ class DepartmentsController extends Controller
$department->user_id = Auth::user()->id; $department->user_id = Auth::user()->id;
$department->manager_id = ($request->filled('manager_id' ) ? $request->input('manager_id') : null); $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()) { if ($department->save()) {
return redirect()->route("departments.index")->with('success', trans('admin/departments/message.create.success')); return redirect()->route("departments.index")->with('success', trans('admin/departments/message.create.success'));
@ -169,7 +169,7 @@ class DepartmentsController extends Controller
$department->fill($request->all()); $department->fill($request->all());
$department->manager_id = ($request->filled('manager_id' ) ? $request->input('manager_id') : null); $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()) { if ($department->save()) {
return redirect()->route("departments.index")->with('success', trans('admin/departments/message.update.success')); return redirect()->route("departments.index")->with('success', trans('admin/departments/message.update.success'));

4
app/Http/Controllers/LocationsController.php
View file

@ -81,7 +81,7 @@ class LocationsController extends Controller
$location->manager_id = $request->input('manager_id'); $location->manager_id = $request->input('manager_id');
$location->user_id = Auth::id(); $location->user_id = Auth::id();
$location = $request->handleImages($location,600, public_path().'/uploads/locations'); $location = $request->handleImages($location);
if ($location->save()) { if ($location->save()) {
return redirect()->route("locations.index")->with('success', trans('admin/locations/message.create.success')); 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->ldap_ou = $request->input('ldap_ou');
$location->manager_id = $request->input('manager_id'); $location->manager_id = $request->input('manager_id');
$location = $request->handleImages($location,600, public_path().'/uploads/locations'); $location = $request->handleImages($location);
if ($location->save()) { if ($location->save()) {

4
app/Http/Controllers/SuppliersController.php
View file

@ -69,7 +69,7 @@ class SuppliersController extends Controller
$supplier->notes = request('notes'); $supplier->notes = request('notes');
$supplier->url = $supplier->addhttp(request('url')); $supplier->url = $supplier->addhttp(request('url'));
$supplier->user_id = Auth::id(); $supplier->user_id = Auth::id();
$supplier = $request->handleImages($supplier,600, public_path().'/uploads/suppliers'); $supplier = $request->handleImages($supplier);
if ($supplier->save()) { if ($supplier->save()) {
@ -129,7 +129,7 @@ class SuppliersController extends Controller
$supplier->email = request('email'); $supplier->email = request('email');
$supplier->url = $supplier->addhttp(request('url')); $supplier->url = $supplier->addhttp(request('url'));
$supplier->notes = request('notes'); $supplier->notes = request('notes');
$supplier = $request->handleImages($supplier,600, public_path().'/uploads/suppliers'); $supplier = $request->handleImages($supplier);
if ($supplier->save()) { if ($supplier->save()) {
return redirect()->route('suppliers.index')->with('success', trans('admin/suppliers/message.update.success')); return redirect()->route('suppliers.index')->with('success', trans('admin/suppliers/message.update.success'));

6
app/Http/Controllers/Users/UsersController.php
View file

@ -126,7 +126,9 @@ class UsersController extends Controller
} }
$user->permissions = json_encode($permissions_array); $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 ($user->save()) {
if ($request->filled('groups')) { if ($request->filled('groups')) {
@ -288,7 +290,7 @@ class UsersController extends Controller
$user->permissions = json_encode($permissions_array); $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? // Was the user updated?

16
app/Http/Requests/ImageUploadRequest.php
View file

@ -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 // 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}); try {
$item->{$fieldname} = null; Storage::disk('public')->delete($path . '/' . $item->{$fieldname});
} catch (\Exception $e) { $item->{$fieldname} = null;
\Log::debug($e); } catch (\Exception $e) {
\Log::debug($e);
}
} }
} }

2
app/Http/Transformers/DepartmentsTransformer.php
View file

@ -48,7 +48,7 @@ class DepartmentsTransformer
$permissions_array['available_actions'] = [ $permissions_array['available_actions'] = [
'update' => Gate::allows('update', Department::class), '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; $array += $permissions_array;

2
resources/views/accessories/edit.blade.php
View file

@ -29,7 +29,7 @@
<label class="col-md-3 control-label" for="image_delete">{{ trans('general.image_delete') }}</label> <label class="col-md-3 control-label" for="image_delete">{{ trans('general.image_delete') }}</label>
<div class="col-md-5"> <div class="col-md-5">
{{ Form::checkbox('image_delete') }} {{ Form::checkbox('image_delete') }}
<img src="{{ Storage::disk('public')->url('uploads/accessories/'.e($item->image)) }}" class="img-responsive" /> <img src="{{ Storage::disk('public')->url('accessories/'.e($item->image)) }}" class="img-responsive" />
{!! $errors->first('image_delete', '<span class="alert-msg" aria-hidden="true">:message</span>') !!} {!! $errors->first('image_delete', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>

35
resources/views/suppliers/edit.blade.php
View file

@ -44,28 +44,21 @@
@include ('partials.forms.edit.notes') @include ('partials.forms.edit.notes')
<!-- Image --> <!-- Image -->
@if ($item->image) @if (($item->image) && ($item->image!=''))
<div class="form-group {{ $errors->has('image_delete') ? 'has-error' : '' }}">
<div class="form-group {{ $errors->has('image_delete') ? 'has-error' : '' }}"> <label class="col-md-3 control-label" for="image_delete">{{ trans('general.image_delete') }}</label>
<label class="col-md-3 control-label" for="image_delete">{{ trans('general.image_delete') }}</label> <div class="col-md-5">
<div class="col-md-5"> <label for="image_delete">
{{ Form::checkbox('image_delete') }} {{ Form::checkbox('image_delete', '1', old('image_delete'), array('class' => 'minimal', 'aria-label'=>'required')) }}
<img src="{{ url('/') }}/uploads/suppliers/{{ $item->image }}" /> </label>
{!! $errors->first('image_delete', '<span class="alert-msg" aria-hidden="true">:message</span>') !!} <br>
<img src="{{ url('/') }}/uploads/models/{{ $item->image }}" alt="Image for {{ $item->name }}">
{!! $errors->first('image_delete', '<span class="alert-msg" aria-hidden="true"><br>:message</span>') !!}
</div>
</div> </div>
</div>
@endif @endif
<div class="form-group {{ $errors->has('image') ? 'has-error' : '' }}"> @include ('partials.forms.edit.image-upload')
<label class="col-md-3 control-label" for="image">{{ trans('general.image_upload') }}</label>
<div class="col-md-5">
<label class="btn btn-default">
{{ trans('button.select_file') }}
<input type="file" name="image" accept="image/gif,image/jpeg,image/png,image/svg" hidden>
</label>
<p class="help-block">Accepted filetypes are jpg, png, gif and svg</p>
{!! $errors->first('image', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div>
</div>
@stop @stop