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

Merge pull request #3336 from techAPJ/patch-1

Browse Source 
FEATURE: support inviting existing users to topic and message when SSO is enabled
This commit is contained in:
Régis Hanol
2015-04-06 11:11:42 +02:00
parent f180d22025 e8dd5592c6
commit 50edad5fb2
6 changed files with 30 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/guardian.rb
View File

@@ -197,12 +197,6 @@ class Guardian
is_me?(user)
end
def invitations_allowed?
!SiteSetting.enable_sso &&
SiteSetting.enable_local_logins &&
(!SiteSetting.must_approve_users? || is_staff?)
end
def can_invite_to_forum?(groups=nil)
authenticated? &&
!SiteSetting.enable_sso &&
@@ -216,7 +210,7 @@ class Guardian
def can_invite_to?(object, group_ids=nil)
return false if ! authenticated?
return false if ! invitations_allowed?
return false unless ( SiteSetting.enable_local_logins && (!SiteSetting.must_approve_users? || is_staff?) )
return true if is_admin?
return false if ! can_see?(object)