A free open source IT asset/license management system
Implement fix
Marcus Mooreac8a9e38f0ab
diff --git a/app/Http/Controllers/Assets/BulkAssetsController.php b/app/Http/Controllers/Assets/BulkAssetsController.phpindex 6c75ae06db..8ba3ccf99d 100644--- a/app/Http/Controllers/Assets/BulkAssetsController.php+++ b/app/Http/Controllers/Assets/BulkAssetsController.php@@ -647,6 +647,14 @@ class BulkAssetsController extends Controller$assets = Asset::findOrFail($asset_ids);+ if ($assets->pluck('assigned_to')->unique()->filter()->isNotEmpty()) {+ // re-add the asset ids so the assets select is re-populated+ $request->session()->flashInput(['selected_assets' => $asset_ids]);++ return redirect(route('hardware.bulkcheckout.show'))+ ->with('error', trans('general.error_assets_already_checked_out'));+ }+if (request('checkout_to_type') == 'asset') {foreach ($asset_ids as $asset_id) {if ($target->id == $asset_id) {diff --git a/resources/lang/en-US/general.php b/resources/lang/en-US/general.phpindex 61b7c9f809..42751c5cf9 100644--- a/resources/lang/en-US/general.php+++ b/resources/lang/en-US/general.php@@ -520,6 +520,7 @@ return ['item_name_var' => ':item Name','error_user_company' => 'Checkout target company and asset company do not match','error_user_company_accept_view' => 'An Asset assigned to you belongs to a different company so you can\'t accept nor deny it, please check with your manager',+ 'error_assets_already_checked_out' => 'One or more of the assets are already checked out','importer' => ['checked_out_to_fullname' => 'Checked Out to: Full Name','checked_out_to_first_name' => 'Checked Out to: First Name',