github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-28 10:32:08 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Skip 'invited' small action if user is in an invited group (#9056)

Browse Source 
Inviting a user that is already invited through a group used to generate
a small action and a notification. This commit skips that small action.
This commit is contained in:
Dan Ungureanu
2020-02-27 14:45:20 +02:00
committed by GitHub
parent dfe11321d8
commit 60908a94ec
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/topic.rb
View File

@ -1441,7 +1441,9 @@ class Topic < ActiveRecord::Base
Topic.transaction do
rate_limit_topic_invitation(invited_by)
topic_allowed_users.create!(user_id: target_user.id) unless topic_allowed_users.exists?(user_id: target_user.id)
add_small_action(invited_by, "invited_user", target_user.username)
user_in_allowed_group = (user.group_ids & topic_allowed_groups.map(&:group_id)).present?
add_small_action(invited_by, "invited_user", target_user.username) if !user_in_allowed_group
create_invite_notification!(
target_user,