Skip to content

A free open source IT asset/license management system

Set $files only if there are results

snipe406951fc84e0
diff --git a/app/Http/Controllers/Api/UploadedFilesController.php b/app/Http/Controllers/Api/UploadedFilesController.php
index 5278dea6cd..787a6669b4 100644
--- a/app/Http/Controllers/Api/UploadedFilesController.php
+++ b/app/Http/Controllers/Api/UploadedFilesController.php
@@ -113,12 +113,15 @@ class UploadedFilesController extends Controller
$object->logUpload($file_name, $request->input('notes'));
}
- $files = Actionlog::select('action_logs.*')->where('action_type', '=', 'uploaded')
- ->where('item_type', '=', self::$map_object_type[$object_type])
- ->where('item_id', '=', $id)->whereIn('filename', $files)
- ->get();
+ if ($files) {
+ $file_results = Actionlog::select('action_logs.*')->where('action_type', '=', 'uploaded')
+ ->where('item_type', '=', self::$map_object_type[$object_type])
+ ->where('item_id', '=', $id)->whereIn('filename', $files)
+ ->get();
+
+ return response()->json(Helper::formatStandardApiResponse('success', (new UploadedFilesTransformer())->transformFiles($file_results, count($file_results)), trans_choice('general.file_upload_status.upload.success', count($files))));
+ }
- return response()->json(Helper::formatStandardApiResponse('success', (new UploadedFilesTransformer())->transformFiles($files, count($files)), trans_choice('general.file_upload_status.upload.success', count($files))));
}
// No files were submitted