Minor transformer cleanup

2017-01-25 21:01:00 -08:00
parent 855d775c41
commit a9bf34cf61
3 changed files with 16 additions and 6 deletions
@@ -24,7 +24,7 @@ class AssetsTransformer
            'name' => $asset->name,
            'asset_tag' => $asset->asset_tag,
            'serial' => $asset->serial,
-            'model' => ($asset->model) ? $asset->model : '',
+            'model' => ($asset->model) ? ['id' => $asset->model->id,'name'=> $asset->model->name] : '',
            'model_number' => $asset->model_number,
            'status_label' => ($asset->assetstatus) ? $asset->assetstatus : null,
            'last_checkout' => $asset->last_checkout,
@@ -44,6 +44,16 @@ class AssetsTransformer

        ];

+        if ($asset->model->fieldset) {
+
+         foreach($asset->model->fieldset->fields as $field) {
+             $fields_array = [$field->name => $asset->{$field->convertUnicodeDbSlug()}];
+             $array += $fields_array;
+             //array_push($array, $fields_array);
+         }
+
+        }
+
        return $array;
    }