From 643a6e5824cc8ffb6b58288b7822f42d13476c8f Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Tue, 27 Aug 2013 21:35:41 +0300 Subject: 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 --- app/models/project_team.rb | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'app/models/project_team.rb') 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) -- cgit v1.2.1