diff options
Diffstat (limited to 'app/Model')
| -rw-r--r-- | app/Model/Comment.php | 3 | ||||
| -rw-r--r-- | app/Model/ProjectActivity.php | 7 | ||||
| -rw-r--r-- | app/Model/Subtask.php | 1 |
3 files changed, 7 insertions, 4 deletions
diff --git a/app/Model/Comment.php b/app/Model/Comment.php index a36f2b45..844f0c89 100644 --- a/app/Model/Comment.php +++ b/app/Model/Comment.php @@ -47,7 +47,8 @@ class Comment extends Base self::TABLE.'.user_id', self::TABLE.'.comment', User::TABLE.'.username', - User::TABLE.'.name' + User::TABLE.'.name', + User::TABLE.'.email' ) ->join(User::TABLE, 'id', 'user_id') ->orderBy(self::TABLE.'.date', 'ASC') diff --git a/app/Model/ProjectActivity.php b/app/Model/ProjectActivity.php index 46d71fc7..05081a47 100644 --- a/app/Model/ProjectActivity.php +++ b/app/Model/ProjectActivity.php @@ -131,18 +131,19 @@ class ProjectActivity extends Base ->columns( self::TABLE.'.*', User::TABLE.'.username AS author_username', - User::TABLE.'.name AS author_name' + User::TABLE.'.name AS author_name', + User::TABLE.'.email' ) ->in('project_id', $project_ids) ->join(User::TABLE, 'id', 'creator_id') ->desc(self::TABLE.'.id') ->limit($limit); - if(!is_null($start)){ + if (!is_null($start)){ $query->gte('date_creation', $start); } - if(!is_null($end)){ + if (!is_null($end)){ $query->lte('date_creation', $end); } diff --git a/app/Model/Subtask.php b/app/Model/Subtask.php index e33373e0..492f3a77 100644 --- a/app/Model/Subtask.php +++ b/app/Model/Subtask.php @@ -98,6 +98,7 @@ class Subtask extends Base Subtask::TABLE.'.*', Task::TABLE.'.project_id', Task::TABLE.'.color_id', + Task::TABLE.'.title AS task_name', Project::TABLE.'.name AS project_name' ) ->eq('user_id', $user_id) |