From db43628bdc04c0e3723daccc8f92666faeafdc24 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 5 Jan 2023 13:12:54 -0800 Subject: [PATCH 1/2] Added default field info to models API response Signed-off-by: snipe --- app/Http/Transformers/AssetModelsTransformer.php | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/app/Http/Transformers/AssetModelsTransformer.php b/app/Http/Transformers/AssetModelsTransformer.php index 528df3b14..5b5170996 100644 --- a/app/Http/Transformers/AssetModelsTransformer.php +++ b/app/Http/Transformers/AssetModelsTransformer.php @@ -22,6 +22,21 @@ class AssetModelsTransformer public function transformAssetModel(AssetModel $assetmodel) { + + $default_field_values = array(); + + // Reach into the custom fields and models_custom_fields pivot table to find the default values for this model + if ($assetmodel->fieldset) { + foreach($assetmodel->fieldset->fields AS $field) { + $default_field_values[] = [ + 'name' => e($field->name), + 'db_column_name' => e($field->db_column_name()), + 'default_value' => ($field->defaultValue($assetmodel->id)) ? e($field->defaultValue($assetmodel->id)) : null, + 'required' => ($field->pivot->required == '1') ? true : false, + ]; + } + } + $array = [ 'id' => (int) $assetmodel->id, 'name' => e($assetmodel->name), @@ -44,6 +59,7 @@ class AssetModelsTransformer 'id' => (int) $assetmodel->fieldset->id, 'name'=> e($assetmodel->fieldset->name), ] : null, + 'default_fieldset_values' => $default_field_values, 'eol' => ($assetmodel->eol > 0) ? $assetmodel->eol.' months' : 'None', 'requestable' => ($assetmodel->requestable == '1') ? true : false, 'notes' => e($assetmodel->notes), From 381f89c5a82395d957cde9c61d9d51a281cca808 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 5 Jan 2023 13:15:30 -0800 Subject: [PATCH 2/2] Added format to array Signed-off-by: snipe --- app/Http/Transformers/AssetModelsTransformer.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Http/Transformers/AssetModelsTransformer.php b/app/Http/Transformers/AssetModelsTransformer.php index 5b5170996..d694ac5b4 100644 --- a/app/Http/Transformers/AssetModelsTransformer.php +++ b/app/Http/Transformers/AssetModelsTransformer.php @@ -32,6 +32,7 @@ class AssetModelsTransformer 'name' => e($field->name), 'db_column_name' => e($field->db_column_name()), 'default_value' => ($field->defaultValue($assetmodel->id)) ? e($field->defaultValue($assetmodel->id)) : null, + 'format' => e($field->format), 'required' => ($field->pivot->required == '1') ? true : false, ]; }