From 658123a2328867a87da59ca660a7044d99eea22c Mon Sep 17 00:00:00 2001 From: Frédéric Guillot Date: Sat, 16 Aug 2014 17:53:07 -0700 Subject: The fullname is displayed instead of the username if not empty --- app/Model/Task.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'app/Model/Task.php') diff --git a/app/Model/Task.php b/app/Model/Task.php index 6647f041..0753c57d 100644 --- a/app/Model/Task.php +++ b/app/Model/Task.php @@ -125,7 +125,9 @@ class Task extends Base projects.name AS project_name, columns.title AS column_title, users.username AS assignee_username, - creators.username AS creator_username + users.name AS assignee_name, + creators.username AS creator_username, + creators.name AS creator_name FROM tasks LEFT JOIN users ON users.id = tasks.owner_id LEFT JOIN users AS creators ON creators.id = tasks.creator_id @@ -209,7 +211,8 @@ class Task extends Base 'tasks.is_active', 'tasks.score', 'tasks.category_id', - 'users.username' + 'users.username AS assignee_username', + 'users.name AS assignee_name' ) ->join(User::TABLE, 'id', 'owner_id'); -- cgit v1.2.3