Commit c9fb7e39 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Project Team now supports a non-group projects

parent 209f96be
No related merge requests found
...@@ -23,7 +23,12 @@ class ProjectTeam ...@@ -23,7 +23,12 @@ class ProjectTeam
def find user_id def find user_id
user = project.users.find_by_id(user_id) user = project.users.find_by_id(user_id)
user ||= project.group.users.find_by_id(user_id)
if group
user ||= group.users.find_by_id(user_id)
end
user
end end
def get_tm user_id def get_tm user_id
...@@ -106,13 +111,17 @@ class ProjectTeam ...@@ -106,13 +111,17 @@ class ProjectTeam
def fetch_members(level = nil) def fetch_members(level = nil)
project_members = project.users_projects project_members = project.users_projects
group_members = project.group.users_groups group_members = group ? group.users_groups : []
if level if level
project_members = project_members.send(level) project_members = project_members.send(level)
group_members = group_members.send(level) group_members = group_members.send(level) if group
end end
(project_members + group_members).map(&:user).uniq (project_members + group_members).map(&:user).uniq
end end
def group
project.group
end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment