Merge branch 'develop' into add-display-name-to-users-fixed

2025-08-25 15:28:20 +01:00
parent e60f2b2332 6503f9c667
commit c8e79aa5ca
46 changed files with 19958 additions and 1191 deletions
@@ -31,6 +31,7 @@ class UsersTransformer
        $array = [
                'id' => (int) $user->id,
                'avatar' => e($user->present()->gravatar) ?? null,
+
                'name' => e($user->getFullNameAttribute()) ?? null,
                'first_name' => e($user->first_name) ?? null,
                'last_name' => e($user->last_name) ?? null,
@@ -139,7 +140,6 @@ class UsersTransformer
            'first_name' => e($user->first_name),
            'last_name' => e($user->last_name),
            'username' => e($user->username),
-            'display_name' => e($user->display_name),
            'created_by' => $user->adminuser ? [
                'id' => (int) $user->adminuser->id,
                'name'=> e($user->adminuser->present()->fullName),