The fullname is displayed instead of the username if not empty

1 files changed, 11 insertions, 1 deletions

diff --git a/app/Model/User.php b/app/Model/User.php
index 5f6b8a3a..19ec0494 100644
--- a/app/Model/User.php
+++ b/app/Model/User.php
@@ -98,7 +98,17 @@ class User extends Base
      */
     public function getList()
     {
-        return $this->db->table(self::TABLE)->asc('username')->listing('id', 'username');
+        $users = $this->db->table(self::TABLE)->columns('id', 'username', 'name')->findAll();
+
+        $result = array();
+
+        foreach ($users as $user) {
+            $result[$user['id']] = $user['name'] ?: $user['username'];
+        }
+
+        asort($result);
+
+        return $result;
     }
 
     /**