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 #4983 from tgxworld/group_owners_can_invite_users_to_groups

Browse Source 
Group owners can invite users to groups
This commit is contained in:
Guo Xiang Tan
2017-07-24 16:21:19 +09:00
committed by GitHub
parent fa09a02201 2a17f1ccd7
commit 1b0750d7ef
19 changed files with 256 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/guardian.rb
View File

@@ -242,16 +242,16 @@ class Guardian
(!SiteSetting.must_approve_users? && @user.has_trust_level?(TrustLevel[2])) ||
is_staff?
) &&
(groups.blank? || is_admin?)
(groups.blank? || is_admin? || groups.all? { |g| can_edit_group?(g) })
end
def can_invite_to?(object, group_ids=nil)
def can_invite_to?(object, groups=nil)
return false unless authenticated?
return true if is_admin?
return false unless SiteSetting.enable_private_messages?
return false if (SiteSetting.max_invites_per_day.to_i == 0 && !is_staff?)
return false unless can_see?(object)
return false if group_ids.present?
return false if groups.present?
if object.is_a?(Topic) && object.category
if object.category.groups.any?