DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Added fragment to uploads for redirect

Browse source 
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe 2025-01-21 18:06:00 +00:00
parent 2668960bb9
commit d5309c7d94
8 changed files with 21 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/Http/Controllers/Accessories/AccessoriesFilesController.php
View file

@ -51,7 +51,7 @@ class AccessoriesFilesController extends Controller
} }
return redirect()->route('accessories.show', $accessory->id)->with('success', trans('general.file_upload_success')); return redirect()->route('accessories.show', $accessory->id)->withFragment('files')->with('success', trans('general.file_upload_success'));
} }
@ -90,8 +90,7 @@ class AccessoriesFilesController extends Controller
$log->delete(); $log->delete();
return redirect()->back() return redirect()->back()->withFragment('files')->with('success', trans('admin/hardware/message.deletefile.success'));
->with('success', trans('admin/hardware/message.deletefile.success'));
} }
// Redirect to the licence management page // Redirect to the licence management page

9
app/Http/Controllers/AssetModelsFilesController.php
View file

@ -44,10 +44,10 @@ class AssetModelsFilesController extends Controller
$model->logUpload($file_name, $request->get('notes')); $model->logUpload($file_name, $request->get('notes'));
} }
return redirect()->back()->with('success', trans('general.file_upload_success')); return redirect()->back()->withFragment('files')->with('success', trans('general.file_upload_success'));
} }
return redirect()->back()->with('error', trans('admin/hardware/message.upload.nofiles')); return redirect()->back()->withFragment('files')->with('error', trans('admin/hardware/message.upload.nofiles'));
} }
/** /**
@ -119,11 +119,10 @@ class AssetModelsFilesController extends Controller
} }
$log->delete(); $log->delete();
return redirect()->back()->with('success', trans('admin/hardware/message.deletefile.success')); return redirect()->back()->withFragment('files')->with('success', trans('admin/hardware/message.deletefile.success'));
} }
return redirect()->back() return redirect()->back()->withFragment('files')->with('success', trans('admin/hardware/message.deletefile.success'));
->with('success', trans('admin/hardware/message.deletefile.success'));
} }
// Redirect to the hardware management page // Redirect to the hardware management page

20
app/Http/Controllers/Assets/AssetFilesController.php
View file

@ -45,7 +45,7 @@ class AssetFilesController extends Controller
$asset->logUpload($file_name, $request->get('notes')); $asset->logUpload($file_name, $request->get('notes'));
} }
return redirect()->back()->with('success', trans('admin/hardware/message.upload.success')); return redirect()->back()->withFragment('files')->with('success', trans('admin/hardware/message.upload.success'));
} }
return redirect()->back()->with('error', trans('admin/hardware/message.upload.nofiles')); return redirect()->back()->with('error', trans('admin/hardware/message.upload.nofiles'));
@ -97,25 +97,19 @@ class AssetFilesController extends Controller
*/ */
public function destroy($assetId = null, $fileId = null) : RedirectResponse public function destroy($assetId = null, $fileId = null) : RedirectResponse
{ {
$asset = Asset::find($assetId); if ($asset = Asset::find($assetId)) {
$this->authorize('update', $asset);
$rel_path = 'private_uploads/assets';
// the asset is valid
if (isset($asset->id)) {
$this->authorize('update', $asset); $this->authorize('update', $asset);
$log = Actionlog::find($fileId); $rel_path = 'private_uploads/assets';
if ($log) {
if ($log = Actionlog::find($fileId)) {
if (Storage::exists($rel_path.'/'.$log->filename)) { if (Storage::exists($rel_path.'/'.$log->filename)) {
Storage::delete($rel_path.'/'.$log->filename); Storage::delete($rel_path.'/'.$log->filename);
} }
$log->delete(); $log->delete();
return redirect()->back()->withFragment('files')->with('success', trans('admin/hardware/message.deletefile.success'));
return redirect()->back()->with('success', trans('admin/hardware/message.deletefile.success'));
} }
return redirect()->back() return redirect()->route('hardware.show', ['hardware' => $asset])->with('error', trans('general.log_record_not_found'));
->with('success', trans('admin/hardware/message.deletefile.success'));
} }
return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.does_not_exist')); return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.does_not_exist'));

4
app/Http/Controllers/Components/ComponentsFilesController.php
View file

@ -50,7 +50,7 @@ class ComponentsFilesController extends Controller
} }
return redirect()->route('components.show', $component->id)->with('success', trans('general.file_upload_success')); return redirect()->route('components.show', $component->id)->withFragment('files')->with('success', trans('general.file_upload_success'));
} }
@ -91,7 +91,7 @@ class ComponentsFilesController extends Controller
$log->delete(); $log->delete();
return redirect()->back() return redirect()->back()->withFragment('files')
->with('success', trans('admin/hardware/message.deletefile.success')); ->with('success', trans('admin/hardware/message.deletefile.success'));
} }

4
app/Http/Controllers/Consumables/ConsumablesFilesController.php
View file

@ -48,7 +48,7 @@ class ConsumablesFilesController extends Controller
} }
return redirect()->route('consumables.show', $consumable->id)->with('success', trans('general.file_upload_success')); return redirect()->route('consumables.show', $consumable->id)->withFragment('files')->with('success', trans('general.file_upload_success'));
} }
@ -89,7 +89,7 @@ class ConsumablesFilesController extends Controller
$log->delete(); $log->delete();
return redirect()->back() return redirect()->back()->withFragment('files')
->with('success', trans('admin/hardware/message.deletefile.success')); ->with('success', trans('admin/hardware/message.deletefile.success'));
} }

4
app/Http/Controllers/Users/UserFilesController.php
View file

@ -56,7 +56,7 @@ class UserFilesController extends Controller
$logActions[] = $logAction; $logActions[] = $logAction;
} }
// dd($logActions); // dd($logActions);
return redirect()->back()->with('success', trans('admin/users/message.upload.success')); return redirect()->back()->withFragment('files')->with('success', trans('admin/users/message.upload.success'));
} }
return redirect()->back()->with('error', trans('admin/users/message.upload.nofiles')); return redirect()->back()->with('error', trans('admin/users/message.upload.nofiles'));
@ -87,7 +87,7 @@ class UserFilesController extends Controller
if (Storage::exists($rel_path.'/'.$filename)) { if (Storage::exists($rel_path.'/'.$filename)) {
Storage::delete($rel_path.'/'.$filename); Storage::delete($rel_path.'/'.$filename);
return redirect()->back()->with('success', trans('admin/users/message.deletefile.success')); return redirect()->back()->withFragment('files')->with('success', trans('admin/users/message.deletefile.success'));
} }
} }

3
app/Http/Requests/UploadFileRequest.php
View file

@ -46,8 +46,6 @@ class UploadFileRequest extends Request
$extension = $file->getClientOriginalExtension(); $extension = $file->getClientOriginalExtension();
$file_name = $name_prefix.'-'.str_random(8).'-'.str_slug(basename($file->getClientOriginalName(), '.'.$extension)).'.'.$file->guessExtension(); $file_name = $name_prefix.'-'.str_random(8).'-'.str_slug(basename($file->getClientOriginalName(), '.'.$extension)).'.'.$file->guessExtension();
Log::debug("Your filetype IS: ".$file->getMimeType());
// Check for SVG and sanitize it // Check for SVG and sanitize it
if ($file->getMimeType() === 'image/svg+xml') { if ($file->getMimeType() === 'image/svg+xml') {
Log::debug('This is an SVG'); Log::debug('This is an SVG');
@ -66,7 +64,6 @@ class UploadFileRequest extends Request
} else { } else {
$put_results = Storage::put($dirname.$file_name, file_get_contents($file)); $put_results = Storage::put($dirname.$file_name, file_get_contents($file));
Log::debug("Here are the '$put_results' (should be 0 or 1 or true or false or something?)");
} }
return $file_name; return $file_name;
} }

4
resources/views/models/view.blade.php
View file

@ -49,7 +49,7 @@
</li> </li>
<li> <li>
<a href="#uploads" data-toggle="tab"> <a href="#files" data-toggle="tab">
<span class="hidden-lg hidden-md"> <span class="hidden-lg hidden-md">
<i class="fas fa-barcode fa-2x"></i> <i class="fas fa-barcode fa-2x"></i>
@ -102,7 +102,7 @@
</div> <!-- /.tab-pane assets --> </div> <!-- /.tab-pane assets -->
<div class="tab-pane fade" id="uploads"> <div class="tab-pane fade" id="files">
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">