From 7db252ade32182adde8fa73b71b5c7f42bd18c7d Mon Sep 17 00:00:00 2001 From: snipe Date: Sat, 19 Mar 2022 23:11:42 +0000 Subject: [PATCH 1/2] Fixed #10840 - defaulting to 0 on supplier ID if no value provided Signed-off-by: snipe --- app/Http/Controllers/Assets/AssetsController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Assets/AssetsController.php b/app/Http/Controllers/Assets/AssetsController.php index c5063eb598..b7afc00bdb 100755 --- a/app/Http/Controllers/Assets/AssetsController.php +++ b/app/Http/Controllers/Assets/AssetsController.php @@ -137,12 +137,12 @@ class AssetsController extends Controller $asset->archived = '0'; $asset->physical = '1'; $asset->depreciate = '0'; - $asset->status_id = request('status_id', 0); + $asset->status_id = request('status_id'); $asset->warranty_months = request('warranty_months', null); $asset->purchase_cost = Helper::ParseCurrency($request->get('purchase_cost')); $asset->purchase_date = request('purchase_date', null); $asset->assigned_to = request('assigned_to', null); - $asset->supplier_id = request('supplier_id', 0); + $asset->supplier_id = request('supplier_id', null); $asset->requestable = request('requestable', 0); $asset->rtd_location_id = request('rtd_location_id', null); From e04ae63d02d7ef5aeb65c46af6de47d3a5223730 Mon Sep 17 00:00:00 2001 From: snipe Date: Sat, 19 Mar 2022 23:12:48 +0000 Subject: [PATCH 2/2] Apply the fix to API controller too :( Signed-off-by: snipe --- app/Http/Controllers/Api/AssetsController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Api/AssetsController.php b/app/Http/Controllers/Api/AssetsController.php index 2b6a7e2b55..13b745cdff 100644 --- a/app/Http/Controllers/Api/AssetsController.php +++ b/app/Http/Controllers/Api/AssetsController.php @@ -521,7 +521,7 @@ class AssetsController extends Controller $asset->purchase_cost = Helper::ParseCurrency($request->get('purchase_cost')); // this is the API's store method, so I don't know that I want to do this? Confusing. FIXME (or not?!) $asset->purchase_date = $request->get('purchase_date', null); $asset->assigned_to = $request->get('assigned_to', null); - $asset->supplier_id = $request->get('supplier_id', 0); + $asset->supplier_id = $request->get('supplier_id'); $asset->requestable = $request->get('requestable', 0); $asset->rtd_location_id = $request->get('rtd_location_id', null); $asset->location_id = $request->get('rtd_location_id', null);