summaryrefslogtreecommitdiff
path: root/app/models/project_team.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/models/project_team.rb')
-rw-r--r--app/models/project_team.rb10
1 files changed, 9 insertions, 1 deletions
diff --git a/app/models/project_team.rb b/app/models/project_team.rb
index c797c36882f..bc35c4041ba 100644
--- a/app/models/project_team.rb
+++ b/app/models/project_team.rb
@@ -32,7 +32,15 @@ class ProjectTeam
end
def find_tm(user_id)
- project.users_projects.find_by_user_id(user_id)
+ tm = project.users_projects.find_by_user_id(user_id)
+
+ # If user is not in project members
+ # we should check for group membership
+ if group && !tm
+ tm = group.users_groups.find_by_user_id(user_id)
+ end
+
+ tm
end
def add_user(user, access)