summaryrefslogtreecommitdiff
path: root/app/Model/ProjectGroupRole.php
diff options
context:
space:
mode:
Diffstat (limited to 'app/Model/ProjectGroupRole.php')
-rw-r--r--app/Model/ProjectGroupRole.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/app/Model/ProjectGroupRole.php b/app/Model/ProjectGroupRole.php
index 2fe22ca6..ee6ee7cb 100644
--- a/app/Model/ProjectGroupRole.php
+++ b/app/Model/ProjectGroupRole.php
@@ -48,11 +48,13 @@ class ProjectGroupRole extends Base
*/
public function getUserRole($project_id, $user_id)
{
- return $this->db->table(self::TABLE)
+ $roles = $this->db->table(self::TABLE)
->join(GroupMember::TABLE, 'group_id', 'group_id', self::TABLE)
->eq(GroupMember::TABLE.'.user_id', $user_id)
->eq(self::TABLE.'.project_id', $project_id)
- ->findOneColumn('role');
+ ->findAllByColumn('role');
+
+ return $this->projectAccessMap->getHighestRole($roles);
}
/**