summaryrefslogtreecommitdiff
path: root/app/Model/Comment.php
diff options
context:
space:
mode:
authorFrédéric Guillot <fred@kanboard.net>2014-08-16 17:53:07 -0700
committerFrédéric Guillot <fred@kanboard.net>2014-08-16 17:53:07 -0700
commit658123a2328867a87da59ca660a7044d99eea22c (patch)
treee9d278eeba1699b13823dc7b115dce56635d0823 /app/Model/Comment.php
parentdb3c006be80d6690892b11608619f9683824e21b (diff)
The fullname is displayed instead of the username if not empty
Diffstat (limited to 'app/Model/Comment.php')
-rw-r--r--app/Model/Comment.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/app/Model/Comment.php b/app/Model/Comment.php
index b849fc23..43c275bc 100644
--- a/app/Model/Comment.php
+++ b/app/Model/Comment.php
@@ -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)