Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
c9fb7e39
Commit
c9fb7e39
authored
11 years ago
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Project Team now supports a non-group projects
parent
209f96be
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
3 deletions
+12
-3
app/models/project_team.rb
app/models/project_team.rb
+12
-3
No files found.
app/models/project_team.rb
View file @
c9fb7e39
...
@@ -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
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment