A free open source IT asset/license management system
Labels: use instanceOf to differentiate accessors
Godfrey Mbe446e97d7d1
diff --git a/app/Models/Labels/FieldOption.php b/app/Models/Labels/FieldOption.phpindex c5e471fe8e..a1c1284404 100644--- a/app/Models/Labels/FieldOption.php+++ b/app/Models/Labels/FieldOption.php@@ -3,6 +3,7 @@namespace App\Models\Labels;use App\Models\Asset;+use App\Models\User;class FieldOption{@@ -36,8 +37,10 @@ class FieldOptionif ($dataPath[0] === 'displayName') {return $assigned->getRawOriginal('display_name') ?? $assigned->display_name;}-- return $assigned->full_name;+ if ($assigned instanceof User) {+ return $assigned->full_name;+ }+ return $assigned->name ?? $assigned->display_name ?? null;}// Handle Laravel's stupid Carbon datetime casting