A free open source IT asset/license management system
Use display_name in more places
snipea44fe14de196
diff --git a/app/Http/Transformers/AssetModelsTransformer.php b/app/Http/Transformers/AssetModelsTransformer.phpindex 134cebab63..129e395ed8 100644--- a/app/Http/Transformers/AssetModelsTransformer.php+++ b/app/Http/Transformers/AssetModelsTransformer.php@@ -111,11 +111,11 @@ class AssetModelsTransformer$array = ['id' => (int) $file->id,'filename' => e($file->filename),- 'note' => $file->note,+ 'note' => $file->note ? e($file->note) : null,'url' => route('show/modelfile', [$assetmodel->id, $file->id]),'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'),'updated_at' => Helper::getFormattedDateObject($file->updated_at, 'datetime'),diff --git a/app/Http/Transformers/AssetsTransformer.php b/app/Http/Transformers/AssetsTransformer.phpindex 051614070d..4e501da786 100644--- a/app/Http/Transformers/AssetsTransformer.php+++ b/app/Http/Transformers/AssetsTransformer.php@@ -322,14 +322,14 @@ class AssetsTransformer'id' => $accessory_checkout->id,'accessory' => ['id' => $accessory_checkout->accessory->id,- 'name' => $accessory_checkout->accessory->name,+ 'name' => e($accessory_checkout->accessory->display_name),],'assigned_to' => $accessory_checkout->assigned_to,'image' => ($accessory_checkout->accessory->image) ? Storage::disk('public')->url('accessories/' . e($accessory_checkout->accessory->image)) : null,'note' => $accessory_checkout->note ? e($accessory_checkout->note) : null,'created_by' => $accessory_checkout->adminuser ? ['id' => (int)$accessory_checkout->adminuser->id,- 'name' => e($accessory_checkout->adminuser->present()->fullName),+ 'name' => e($accessory_checkout->display_name),] : null,'created_at' => Helper::getFormattedDateObject($accessory_checkout->created_at, 'datetime'),'deleted_at' => Helper::getFormattedDateObject($accessory_checkout->deleted_at, 'datetime'),diff --git a/app/Http/Transformers/LocationsTransformer.php b/app/Http/Transformers/LocationsTransformer.phpindex 8844cd3f7b..0134094611 100644--- a/app/Http/Transformers/LocationsTransformer.php+++ b/app/Http/Transformers/LocationsTransformer.php@@ -30,7 +30,7 @@ class LocationsTransformerforeach ($location->children as $child) {$children_arr[] = ['id' => (int) $child->id,- 'name' => $child->name,+ 'name' => e($child->display_name),];}}