From 5f3df89c64f9b93ce9b8f6a791c6d6d51fd18624 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Fri, 25 Jan 2013 17:18:27 +0200 Subject: Fix teams + gitolite access --- lib/gitlab/user_team_manager.rb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'lib') diff --git a/lib/gitlab/user_team_manager.rb b/lib/gitlab/user_team_manager.rb index 7d9a9bdf3f5..82bb5a05879 100644 --- a/lib/gitlab/user_team_manager.rb +++ b/lib/gitlab/user_team_manager.rb @@ -79,12 +79,10 @@ module Gitlab granted_access = max_teams_member_permission_in_project(user, project) project_team_user = UsersProject.find_by_user_id_and_project_id(user.id, project.id) + project_team_user.destroy if project_team_user.present? - if project_team_user.present? - project_team_user.destroy - end - - if project_team_user.blank? && granted_access > 0 + # project_team_user.project_access != granted_access + if granted_access > 0 UsersProject.add_users_into_projects([project.id], [user.id], granted_access) end end -- cgit v1.2.1