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

Small fixes to accessories files handling

Browse source 
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe 2025-02-10 22:26:00 +00:00
parent b48704b3af
commit c420670ebb
1 changed files with 21 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -55,11 +55,11 @@ class AccessoriesFilesController extends Controller
} }
return redirect()->route('accessories.show', $accessory->id)->with('error', trans('general.no_files_uploaded')); return redirect()->route('accessories.show', $accessory->id)->withFragment('files')->with('error', trans('general.no_files_uploaded'));
} }
// Prepare the error message // Prepare the error message
return redirect()->route('accessories.index') return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.does_not_exist'));
->with('error', trans('general.file_does_not_exist'));
} }
/** /**
@ -72,29 +72,27 @@ class AccessoriesFilesController extends Controller
*/ */
public function destroy($accessoryId = null, $fileId = null) : RedirectResponse public function destroy($accessoryId = null, $fileId = null) : RedirectResponse
{ {
$accessory = Accessory::find($accessoryId); if ($accessory = Accessory::find($accessoryId)) {
// the asset is valid
if (isset($accessory->id)) {
$this->authorize('update', $accessory); $this->authorize('update', $accessory);
$log = Actionlog::find($fileId);
// Remove the file if one exists if ($log = Actionlog::find($fileId)) {
if (Storage::exists('accessories/'.$log->filename)) {
try { if (Storage::exists('private_uploads/accessories/'.$log->filename)) {
Storage::delete('accessories/'.$log->filename); try {
} catch (\Exception $e) { Storage::delete('private_uploads/accessories/' . $log->filename);
Log::debug($e); $log->delete();
return redirect()->back()->withFragment('files')->with('success', trans('admin/hardware/message.deletefile.success'));
} catch (\Exception $e) {
Log::debug($e);
return redirect()->route('accessories.index')->with('error', trans('general.file_does_not_exist'));
}
} }
} }
return redirect()->route('accessories.show', ['accessory' => $accessory])->withFragment('files')->with('error', trans('general.log_record_not_found'));
$log->delete();
return redirect()->back()->withFragment('files')->with('success', trans('admin/hardware/message.deletefile.success'));
} }
// Redirect to the licence management page return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.does_not_exist'));
return redirect()->route('accessories.index')->with('error', trans('general.file_does_not_exist'));
} }
/** /**
@ -124,10 +122,11 @@ class AccessoriesFilesController extends Controller
} }
} }
return redirect()->route('accessories.show', ['accessory' => $accessory])->with('error', trans('general.log_record_not_found')); return redirect()->route('accessories.show', ['accessory' => $accessory])->withFragment('files')->with('error', trans('general.log_record_not_found'));
} }
return redirect()->route('accessories.index')->with('error', trans('general.file_not_found')); return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.does_not_exist'));
} }
} }