From 209dae72faee6042695eb480e2424b311a09bdb0 Mon Sep 17 00:00:00 2001 From: Frederic Guillot Date: Tue, 19 Jan 2016 21:39:11 -0500 Subject: Handle notifications for group members attached to a project --- app/Model/ProjectGroupRole.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'app/Model/ProjectGroupRole.php') diff --git a/app/Model/ProjectGroupRole.php b/app/Model/ProjectGroupRole.php index ee6ee7cb..591b28c6 100644 --- a/app/Model/ProjectGroupRole.php +++ b/app/Model/ProjectGroupRole.php @@ -101,10 +101,10 @@ class ProjectGroupRole extends Base */ public function getAssignableUsers($project_id) { - return $this->db->table(self::TABLE) + return $this->db->table(User::TABLE) ->columns(User::TABLE.'.id', User::TABLE.'.username', User::TABLE.'.name') - ->join(GroupMember::TABLE, 'group_id', 'group_id', self::TABLE) - ->join(User::TABLE, 'id', 'user_id', GroupMember::TABLE) + ->join(GroupMember::TABLE, 'user_id', 'id', User::TABLE) + ->join(self::TABLE, 'group_id', 'group_id', GroupMember::TABLE) ->eq(self::TABLE.'.project_id', $project_id) ->in(self::TABLE.'.role', array(Role::PROJECT_MANAGER, Role::PROJECT_MEMBER)) ->asc(User::TABLE.'.username') -- cgit v1.2.3