Merge remote-tracking branch 'origin/develop'

Author: snipe

app/Http/Controllers/Api/UsersController.php

@@ -435,7 +435,7 @@ public function store(SaveUserRequest $request) : JsonResponse
             $user->password = $user->noPassword();
         }
 
-        app('App\Http\Requests\ImageUploadRequest')->handleImages($user, 600, 'image', 'avatars', 'avatar');
+        app('App\Http\Requests\ImageUploadRequest')->handleImages($user, 600, 'avatar', 'avatars', 'avatar');
 
         if ($user->save()) {
 
@@ -560,7 +560,7 @@ public function update(SaveUserRequest $request, User $user): JsonResponse
                 Asset::where('assigned_type', User::class)
                     ->where('assigned_to', $user->id)->update(['location_id' => $request->input('location_id', null)]);
             }
-            app('App\Http\Requests\ImageUploadRequest')->handleImages($user, 600, 'image', 'avatars', 'avatar');
+            app('App\Http\Requests\ImageUploadRequest')->handleImages($user, 600, 'avatar', 'avatars', 'avatar');
 
             if ($user->save()) {
                 // Check if the request has groups passed and has a value, AND that the user us a superuser

app/Http/Transformers/UsersTransformer.php

@@ -22,7 +22,7 @@ public function transformUsers(Collection $users, $total)
     public function transformUser(User $user)
     {
 
-        $role = '';
+        $role = null;
         if ($user->isSuperUser()) {
             $role = 'superadmin';
         } elseif ($user->isAdmin()) {
@@ -34,7 +34,7 @@ public function transformUser(User $user)
                 'name' => e($user->getFullNameAttribute()) ?? null,
                 'first_name' => e($user->first_name) ?? null,
                 'last_name' => e($user->last_name) ?? null,
-                'display_name' => e($user->getRawOriginal('display_name')) ?? null,
+                'display_name' => ($user->getRawOriginal('display_name')) ? e($user->getRawOriginal('display_name')) : null,
                 'username' => e($user->username) ?? null,
                 'remote' => ($user->remote == '1') ? true : false,
                 'locale' => ($user->locale) ? e($user->locale) : null,