DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-21 03:15:45 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #14055 from snipe/bug/disallow_arrays_for_model_id_in_api_hardware_update

Browse source 
Make sure we're getting an object instead of a collection on Asset API for model_id
This commit is contained in:
snipe 2023-12-19 13:30:54 +00:00 committed by GitHub
parent 1063dcfb7b f9139e0f10
commit fe51d0ef79
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/Http/Controllers/Api/AssetsController.php
View file

@ -574,10 +574,11 @@ class AssetsController extends Controller
$asset = $request->handleImages($asset); $asset = $request->handleImages($asset);
// Update custom fields in the database. // Update custom fields in the database.
// Validation for these fields is handled through the AssetRequest form request $model = AssetModel::find($request->input('model_id'));
$model = AssetModel::find($request->get('model_id'));
if (($model) && ($model->fieldset)) { // Check that it's an object and not a collection
// (Sometimes people send arrays here and they shouldn't
if (($model) && ($model instanceof AssetModel) && ($model->fieldset)) {
foreach ($model->fieldset->fields as $field) { foreach ($model->fieldset->fields as $field) {
// Set the field value based on what was sent in the request // Set the field value based on what was sent in the request