diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-08-27 21:35:41 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-08-27 21:39:34 +0300 |
| commit | 643a6e5824cc8ffb6b58288b7822f42d13476c8f (patch) | |
| tree | 48d417e74e51d2d22b25e6c80e729412ea9c92ae /app/models/project_team.rb | |
| parent | 24e26d8b7a4a2487600f273f7b1a6236691d2664 (diff) | |
| download | gitlab-ce-643a6e5824cc8ffb6b58288b7822f42d13476c8f.tar.gz | |
Improve admin user show page
Show permissions for all project.
Add ability to remove user from group if not an owner
Remove unnecessary admin controller
Diffstat (limited to 'app/models/project_team.rb')
| -rw-r--r-- | app/models/project_team.rb | 10 |
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) |