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

FEATURE: support inviting existing users to topic and message when SSO is enabled

Browse Source
This commit is contained in:
Arpit Jalan
2015-04-05 13:32:43 +05:30
parent 7d5b8de1f8
commit e8dd5592c6
6 changed files with 30 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/invite.rb
View File

@ -66,7 +66,7 @@ class Invite < ActiveRecord::Base
if topic.private_message?
topic.grant_permission_to_user(user.email)
elsif topic.category && topic.category.groups.any?
if Guardian.new(invited_by).can_invite_to?(topic)
if Guardian.new(invited_by).can_invite_to?(topic) && !SiteSetting.enable_sso
(topic.category.groups - user.groups).each { |group| group.add(user) }
end
end