gavin/snipe-it
1
0
Fork 0
mirror of https://github.com/grokability/snipe-it.git synced 2026-03-12 17:52:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse Source
This commit is contained in:
snipe
2026-03-10 10:25:21 +00:00
parent f1ef1bc38a e7eb4f0e80
commit 81cbad52f7
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Transformers/LocationsTransformer.php
View File

@@ -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),
];
}

2
app/Http/Transformers/UploadedFilesTransformer.php
View File

@@ -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'),