home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 13:46:11 +10:00
Code Issues Packages Projects Releases Wiki Activity

Project Team now supports a non-group projects

Browse Source
This commit is contained in:
Dmitriy Zaporozhets
2013-06-18 17:47:52 +03:00
parent 209f96bebe
commit c9fb7e39eb
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/models/project_team.rb
+12 -3
View File
@@ -23,7 +23,12 @@ class ProjectTeam
def find 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
def get_tm user_id
@@ -106,13 +111,17 @@ class ProjectTeam
def fetch_members(level = nil)
project_members = project.users_projects
group_members = project.group.users_groups
group_members = group ? group.users_groups : []
if level
project_members = project_members.send(level)
group_members = group_members.send(level)
group_members = group_members.send(level) if group
end
(project_members + group_members).map(&:user).uniq
end
def group
project.group
end
end