wangbinghao123
/
forgeplus
forked from Gitlink/forgeplus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into standalone_develop

This commit is contained in:
viletyy 2022-10-26 14:58:25 +08:00
parent 6e9962e0da 3d5b2e76d7
commit 893f6c04a5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
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_column(:team_id, team.id)
team_user.update_attributes!({team_id: team.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_column(:team_id, team.id)
team_user.update_attributes!({team_id: team.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_column(:team_id, team.id)
team_user.update_attributes!({team_id: team.id})
# 确保组织成员中有该用户
OrganizationUser.build(self.user_id, user_id)