The fullname is displayed instead of the username if not empty

This commit is contained in:
Frédéric Guillot
2014-08-16 17:53:07 -07:00
parent db3c006be8
commit 658123a232
14 changed files with 48 additions and 22 deletions

View File

@@ -80,12 +80,23 @@ class Project extends Base
*/
public function getAllowedUsers($project_id)
{
return $this->db
$users = $this->db
->table(self::TABLE_USERS)
->join(User::TABLE, 'id', 'user_id')
->eq('project_id', $project_id)
->asc('username')
->listing('user_id', 'username');
->columns(User::TABLE.'.id', User::TABLE.'.username', User::TABLE.'.name')
->findAll();
$result = array();
foreach ($users as $user) {
$result[$user['id']] = $user['name'] ?: $user['username'];
}
asort($result);
return $result;
}
/**