From e27e1a78c35eb308d965c6ad99518a5406a8372d Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 26 Sep 2017 16:01:23 -0700 Subject: [PATCH] Fix for case where a fieldset is assigned to a model, but no fields are assigned --- app/Http/Transformers/AssetsTransformer.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Http/Transformers/AssetsTransformer.php b/app/Http/Transformers/AssetsTransformer.php index 492e86a95b..c8c054c9be 100644 --- a/app/Http/Transformers/AssetsTransformer.php +++ b/app/Http/Transformers/AssetsTransformer.php @@ -75,8 +75,9 @@ class AssetsTransformer ]; - if ($asset->model->fieldset) { + if (($asset->model->fieldset) && (count($asset->model->fieldset->fields)> 0)) { $fields_array = array(); + foreach ($asset->model->fieldset->fields as $field) { if ($field->isFieldDecryptable($asset->{$field->convertUnicodeDbSlug()})) {