scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-10-06 11:57:16 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix user removal from a team [SCI-6323]

Browse source
This commit is contained in:
Oleksii Kriuchykhin 2021-12-06 14:24:59 +01:00
parent 561746158e
commit 30031e2f07
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/controllers/users/settings/user_teams_controller.rb
View file

@ -139,7 +139,8 @@ module Users
@user_t.destroy(new_owner) @user_t.destroy(new_owner)
end end
rescue Exception rescue StandardError => e
Rails.logger.error e.message
invalid = true invalid = true
end end
end end

2
app/models/user_team.rb
View file

@ -18,7 +18,7 @@ class UserTeam < ApplicationRecord
def destroy_associations def destroy_associations
# Destroy the user from all team's projects # Destroy the user from all team's projects
team.projects.joins(:user_projects).where(user_projects: { user: user }).destroy_all user.user_projects.joins(:project).where(project: team.projects).destroy_all
# destroy all assignments # destroy all assignments
UserAssignments::RemoveUserAssignmentJob.perform_now(user, team) UserAssignments::RemoveUserAssignmentJob.perform_now(user, team)
end end