From f270f307289c8fb59efdb140467c407288e70c1b Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Thu, 7 Mar 2024 12:30:08 -0800 Subject: [PATCH] Redirect if no assets are returned from query --- app/Http/Controllers/Assets/BulkAssetsController.php | 6 ++++++ resources/lang/en-US/admin/hardware/message.php | 1 + 2 files changed, 7 insertions(+) diff --git a/app/Http/Controllers/Assets/BulkAssetsController.php b/app/Http/Controllers/Assets/BulkAssetsController.php index 51892e4259..561e13b200 100644 --- a/app/Http/Controllers/Assets/BulkAssetsController.php +++ b/app/Http/Controllers/Assets/BulkAssetsController.php @@ -14,6 +14,7 @@ use App\View\Label; use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\DB; +use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Session; use App\Http\Requests\AssetCheckoutRequest; use App\Models\CustomField; @@ -95,6 +96,11 @@ class BulkAssetsController extends Controller $assets = $assets->get(); + if ($assets->isEmpty()) { + Log::debug('No assets were found for the provided IDs', ['ids' => $asset_ids]); + return redirect()->back()->with('error', trans('admin/hardware/message.update.assets_do_not_exist_or_are_invalid')); + } + $models = $assets->unique('model_id'); $modelNames = []; foreach($models as $model) { diff --git a/resources/lang/en-US/admin/hardware/message.php b/resources/lang/en-US/admin/hardware/message.php index 056692998e..bf050ef974 100644 --- a/resources/lang/en-US/admin/hardware/message.php +++ b/resources/lang/en-US/admin/hardware/message.php @@ -19,6 +19,7 @@ return [ 'success' => 'Asset updated successfully.', 'nothing_updated' => 'No fields were selected, so nothing was updated.', 'no_assets_selected' => 'No assets were selected, so nothing was updated.', + 'assets_do_not_exist_or_are_invalid' => 'Selected assets cannot be updated.', ], 'restore' => [