From 6e30fa692295c415e789a5c4a09bc1db4ded5ec9 Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 23 Aug 2017 03:28:13 -0700 Subject: [PATCH] Fixes custom fields in asset listing where no custom fields were assigned --- app/Http/Transformers/AssetsTransformer.php | 2 ++ resources/views/partials/bootstrap-table.blade.php | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/Http/Transformers/AssetsTransformer.php b/app/Http/Transformers/AssetsTransformer.php index 3d229cc3d7..132fc2de71 100644 --- a/app/Http/Transformers/AssetsTransformer.php +++ b/app/Http/Transformers/AssetsTransformer.php @@ -110,6 +110,8 @@ class AssetsTransformer //array += $fields_array; $array['custom_fields'] = $fields_array; } + } else { + $array['custom_fields'] = array(); } $permissions_array['available_actions'] = [ diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php index 7e12ed4a40..e60602973e 100644 --- a/resources/views/partials/bootstrap-table.blade.php +++ b/resources/views/partials/bootstrap-table.blade.php @@ -256,7 +256,7 @@ $('.snipe-table').bootstrapTable({ // Pull out any HTMl that might be passed via the presenter // (for example, the locked icon for encrypted fields) var field_column_plain = field_column.replace(/<(?:.|\n)*?> ?/gm, ''); - if (row.custom_fields[field_column_plain]) { + if ((row.custom_fields) && (row.custom_fields[field_column_plain])) { return row.custom_fields[field_column_plain].value; }