DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-12 16:44:08 -08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Merge pull request #12679 from snipe/bug/sc-20451

Browse source 
Handle already-deleted license files more gracefully
This commit is contained in:
snipe 2023-03-15 16:26:15 -07:00 committed by GitHub
parent fdacd5d5b5 e9601bcf13
commit b64d7e38f2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/Http/Controllers/Licenses/LicenseFilesController.php
View file

@ -91,12 +91,11 @@ class LicenseFilesController extends Controller
*/ */
public function destroy($licenseId = null, $fileId = null) public function destroy($licenseId = null, $fileId = null)
{ {
$license = License::find($licenseId); if ($license = License::find($licenseId)) {
// the asset is valid
if (isset($license->id)) {
$this->authorize('update', $license); $this->authorize('update', $license);
$log = Actionlog::find($fileId);
if ($log = Actionlog::find($fileId)) {
// Remove the file if one exists // Remove the file if one exists
if (Storage::exists('licenses/'.$log->filename)) { if (Storage::exists('licenses/'.$log->filename)) {
@ -113,7 +112,9 @@ class LicenseFilesController extends Controller
->with('success', trans('admin/hardware/message.deletefile.success')); ->with('success', trans('admin/hardware/message.deletefile.success'));
} }
// Redirect to the licence management page return redirect()->route('licenses.index')->with('error', trans('general.log_does_not_exist'));
}
return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.does_not_exist')); return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.does_not_exist'));
} }
@ -129,7 +130,6 @@ class LicenseFilesController extends Controller
*/ */
public function show($licenseId = null, $fileId = null, $download = true) public function show($licenseId = null, $fileId = null, $download = true)
{ {
\Log::info('Private filesystem is: '.config('filesystems.default'));
$license = License::find($licenseId); $license = License::find($licenseId);
// the license is valid // the license is valid

2
resources/lang/en/general.php
View file

@ -407,7 +407,7 @@ return [
'true' => 'True', 'true' => 'True',
'false' => 'False', 'false' => 'False',
'integration_option' => 'Integration Option', 'integration_option' => 'Integration Option',
'log_does_not_exist' => 'No matching log record exists.',
]; ];