Browse Source

修复:同步项目权限到组织时需预先判断是否存在于团队中

pull/313/head
yystopf 3 years ago
parent
commit
423d5a9316
1 changed files with 3 additions and 3 deletions
  1. +3
    -3
      app/models/concerns/project_operable.rb

+ 3
- 3
app/models/concerns/project_operable.rb View File

@@ -130,7 +130,7 @@ module ProjectOperable
team_user = member.team_user
$gitea_client.delete_teams_members_by_id_username(team_user.team.gtid, team_user.user&.login) rescue nil # 移除旧的
$gitea_client.put_teams_members_by_id_username(team&.gtid, team_user.user&.login) rescue nil # 新增新的
team_user.update_attributes!({team_id: team.id})
team_user.update_attributes!({team_id: team.id}) unless team.team_users.exists?(user_id: member.user_id)

# 确保组织成员中有该用户
OrganizationUser.build(self.user_id, user_id)
@@ -150,7 +150,7 @@ module ProjectOperable
team_user = member.team_user
$gitea_client.delete_teams_members_by_id_username(team_user.team.gtid, team_user.user&.login) rescue nil # 移除旧的
$gitea_client.put_teams_members_by_id_username(team&.gtid, team_user.user&.login) rescue nil # 新增新的
team_user.update_attributes!({team_id: team.id})
team_user.update_attributes!({team_id: team.id}) unless team.team_users.exists?(user_id: member.user_id)

OrganizationUser.build(self.user_id, user_id)
when 'Reporter'
@@ -170,7 +170,7 @@ module ProjectOperable
team_user = member.team_user
$gitea_client.delete_teams_members_by_id_username(team_user.team.gtid, team_user.user&.login) rescue nil # 移除旧的
$gitea_client.put_teams_members_by_id_username(team&.gtid, team_user.user&.login) rescue nil # 新增新的
team_user.update_attributes!({team_id: team.id})
team_user.update_attributes!({team_id: team.id}) unless team.team_users.exists?(user_id: member.user_id)

# 确保组织成员中有该用户
OrganizationUser.build(self.user_id, user_id)


Loading…
Cancel
Save