IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert "DEV: DiscourseEvents fired when users are added/removed from groups (#9522)"

Browse Source 
This reverts commit 54ec9f7009.

The commit clashes with a previous implementation of the same event
This commit is contained in:
Sam Saffron 2020-04-23 15:06:55 +10:00
parent 52c1d7337e
commit d69ec186b9
No known key found for this signature in database
GPG Key ID: B9606168D2FFD9F5
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/services/group_action_logger.rb
View File

@ -28,7 +28,6 @@ class GroupActionLogger
def log_add_user_to_group(target_user) def log_add_user_to_group(target_user)
(target_user == @acting_user && @group.public_admission) || can_edit? (target_user == @acting_user && @group.public_admission) || can_edit?
DiscourseEvent.trigger(:user_added_to_group, target_user, @group)
GroupHistory.create!(default_params.merge( GroupHistory.create!(default_params.merge(
action: GroupHistory.actions[:add_user_to_group], action: GroupHistory.actions[:add_user_to_group],
target_user: target_user target_user: target_user
@ -38,7 +37,6 @@ class GroupActionLogger
def log_remove_user_from_group(target_user) def log_remove_user_from_group(target_user)
(target_user == @acting_user && @group.public_exit) || can_edit? (target_user == @acting_user && @group.public_exit) || can_edit?
DiscourseEvent.trigger(:user_removed_from_group, target_user, @group)
GroupHistory.create!(default_params.merge( GroupHistory.create!(default_params.merge(
action: GroupHistory.actions[:remove_user_from_group], action: GroupHistory.actions[:remove_user_from_group],
target_user: target_user target_user: target_user