3
0
mirror of https://github.com/snipe/snipe-it.git synced 2026-02-06 00:25:45 +00:00

Merge pull request #17967 from marcusmoore/fixes/17963-delete-file-via-api-fix

Fixed #17963 - over eager deletion of asset files via api
This commit is contained in:
snipe
2025-10-06 20:52:57 +01:00
committed by GitHub

View File

@ -193,8 +193,12 @@ class UploadedFilesController extends Controller
// Check for the file
$log = Actionlog::find($file_id)->where('item_type', self::$map_object_type[$object_type])
->where('item_id', $object->id)->first();
$log = Actionlog::query()
->where('id', $file_id)
->where('action_type', 'uploaded')
->where('item_type', self::$map_object_type[$object_type])
->where('item_id', $object->id)
->first();
if ($log) {
// Check the file actually exists, and delete it
@ -213,4 +217,4 @@ class UploadedFilesController extends Controller
return response()->json(Helper::formatStandardApiResponse('error', null, trans_choice('general.file_upload_status.delete.error', 1)), 500);
}
}
}