AS1024/Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The fullname is displayed instead of the username if not empty

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Model/Comment.php
View File

@@ -45,7 +45,8 @@ class Comment extends Base
self::TABLE.'.task_id',
self::TABLE.'.user_id',
self::TABLE.'.comment',
User::TABLE.'.username'
User::TABLE.'.username',
User::TABLE.'.name'
)
->join(User::TABLE, 'id', 'user_id')
->orderBy(self::TABLE.'.date', 'ASC')
@@ -70,7 +71,8 @@ class Comment extends Base
self::TABLE.'.user_id',
self::TABLE.'.date',
self::TABLE.'.comment',
User::TABLE.'.username'
User::TABLE.'.username',
User::TABLE.'.name'
)
->join(User::TABLE, 'id', 'user_id')
->eq(self::TABLE.'.id', $comment_id)