diff --git a/app/Http/Transformers/LocationsTransformer.php b/app/Http/Transformers/LocationsTransformer.php index 0134094611..28fdc9ae79 100644 --- a/app/Http/Transformers/LocationsTransformer.php +++ b/app/Http/Transformers/LocationsTransformer.php @@ -157,7 +157,7 @@ class LocationsTransformer 'name' => e($location->name), 'created_by' => $location->adminuser ? [ 'id' => (int) $location->adminuser->id, - 'name'=> e($location->adminuser->present()->fullName), + 'name'=> e($location->adminuser->display_name), ]: null, 'created_at' => Helper::getFormattedDateObject($location->created_at, 'datetime'), ]; @@ -171,7 +171,7 @@ class LocationsTransformer if ($accessory) { return [ 'id' => $accessory->id, - 'name' => $accessory->name, + 'name' => e($accessory->display_name), ]; } diff --git a/app/Http/Transformers/UploadedFilesTransformer.php b/app/Http/Transformers/UploadedFilesTransformer.php index e32aabc8e5..b072506781 100644 --- a/app/Http/Transformers/UploadedFilesTransformer.php +++ b/app/Http/Transformers/UploadedFilesTransformer.php @@ -41,7 +41,7 @@ class UploadedFilesTransformer 'note' => ($file->note) ? e($file->note) : null, 'created_by' => ($file->adminuser) ? [ 'id' => (int) $file->adminuser->id, - 'name'=> e($file->adminuser->present()->fullName), + 'name'=> e($file->adminuser->display_name), ] : null, 'created_at' => Helper::getFormattedDateObject($file->created_at, 'datetime'), 'deleted_at' => Helper::getFormattedDateObject($file->deleted_at, 'datetime'),