scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2026-01-07 00:36:08 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix activities for access permissions [SCI-9863]

Browse source
This commit is contained in:
Martin Artnik 2023-12-12 14:32:26 +01:00
parent 543ac1a404
commit e99e5c46c6
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/controllers/access_permissions/projects_controller.rb
View file

@ -69,10 +69,9 @@ module AccessPermissions
assigned: :manually
)
unless current_user.id == user_assignment.user.id
log_activity(:assign_user_to_project, { user_target: user_assignment.user.id,
role: user_assignment.user_role.name })
end
log_activity(:assign_user_to_project, { user_target: user_assignment.user.id,
role: user_assignment.user_role.name })
created_count += 1
propagate_job(user_assignment)
end
@ -103,10 +102,8 @@ module AccessPermissions
propagate_job(user_assignment, destroy: true)
unless current_user.id == user_assignment.user.id
log_activity(:unassign_user_from_project, { user_target: user_assignment.user.id,
role: user_assignment.user_role.name })
end
log_activity(:unassign_user_from_project, { user_target: user_assignment.user.id,
role: user_assignment.user_role.name })
render json: { flash: t('access_permissions.destroy.success', member_name: escape_input(user.full_name)) }
rescue ActiveRecord::RecordInvalid