From 6b1329133bced8d385019c450dfe52783afedf88 Mon Sep 17 00:00:00 2001 From: snipe Date: Fri, 15 Apr 2022 13:06:35 +0100 Subject: [PATCH 1/2] Adds status ID to asset checkout API endpoint Signed-off-by: snipe --- app/Http/Controllers/Api/AssetsController.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/Http/Controllers/Api/AssetsController.php b/app/Http/Controllers/Api/AssetsController.php index 6132a16c7..e8d805ea2 100644 --- a/app/Http/Controllers/Api/AssetsController.php +++ b/app/Http/Controllers/Api/AssetsController.php @@ -788,6 +788,9 @@ class AssetsController extends Controller $error_payload['target_type'] = 'user'; } + if ($request->filled('status_id')) { + $asset->status_id = $request->get('status_id'); + } if (!isset($target)) { From b2087a9947c2d9b992f422ae10b7ec06f4dae1fe Mon Sep 17 00:00:00 2001 From: snipe Date: Fri, 15 Apr 2022 13:06:55 +0100 Subject: [PATCH 2/2] Adds validator to make sure the status ID is deployable Signed-off-by: snipe --- app/Http/Requests/AssetCheckoutRequest.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Http/Requests/AssetCheckoutRequest.php b/app/Http/Requests/AssetCheckoutRequest.php index 4ba8ce09b..35d17537b 100644 --- a/app/Http/Requests/AssetCheckoutRequest.php +++ b/app/Http/Requests/AssetCheckoutRequest.php @@ -25,6 +25,7 @@ class AssetCheckoutRequest extends Request "assigned_user" => 'required_without_all:assigned_asset,assigned_location', "assigned_asset" => 'required_without_all:assigned_user,assigned_location', "assigned_location" => 'required_without_all:assigned_user,assigned_asset', + 'status_id' => 'exists:status_labels,id,deployable,1', "checkout_to_type" => 'required|in:asset,location,user' ];