scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-12-26 09:42:46 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #6769 from G-Chubinidze/gc_SCI_9788

Browse source 
Redundant notifications [SCI-9788]
This commit is contained in:
Martin Artnik 2023-12-06 09:30:17 +01:00 committed by GitHub
commit 469f581e20
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -35,8 +35,10 @@ module AccessPermissions
@user_assignment.update!(permitted_update_params)
log_activity(:change_user_role_on_project, { user_target: @user_assignment.user.id,
role: @user_assignment.user_role.name })
unless current_user.id == @user_assignment.user.id
log_activity(:change_user_role_on_project, { user_target: @user_assignment.user.id,
role: @user_assignment.user_role.name })
end
propagate_job(@user_assignment)
render :project_member
@ -69,8 +71,10 @@ module AccessPermissions
assigned: :manually
)
log_activity(:assign_user_to_project, { user_target: user_assignment.user.id,
role: user_assignment.user_role.name })
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
created_count += 1
propagate_job(user_assignment)
end
@ -100,8 +104,11 @@ module AccessPermissions
end
propagate_job(user_assignment, destroy: true)
log_activity(:unassign_user_from_project, { user_target: user_assignment.user.id,
role: user_assignment.user_role.name })
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
render json: { flash: t('access_permissions.destroy.success', member_name: escape_input(user.full_name)) }
rescue ActiveRecord::RecordInvalid