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

DEV: Reuse code for TrustLevelAndStaffSetting (#15044)

Browse Source 
The code that checked this permission was duplicated everytime a new
settings of this type was added. This commit changes the behavior of
some functionality because some feature checks were bypassed for staff
members.
This commit is contained in:
Dan Ungureanu
2021-11-22 20:18:53 +02:00
committed by GitHub
parent fd66df5997
commit d420a7b2c8
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/guardian.rb
View File

@ -56,6 +56,9 @@ class Guardian
def has_trust_level?(level)
false
end
def has_trust_level_or_staff?(level)
false
end
def email
nil
end
@ -443,9 +446,7 @@ class Guardian
# User is authenticated
return false if !authenticated?
# User is trusted enough
return is_admin? if SiteSetting.min_trust_to_send_email_messages.to_s == 'admin'
return is_staff? if SiteSetting.min_trust_to_send_email_messages.to_s == 'staff'
SiteSetting.enable_personal_messages && @user.has_trust_level?(SiteSetting.min_trust_to_send_email_messages.to_i)
SiteSetting.enable_personal_messages && @user.has_trust_level_or_staff?(SiteSetting.min_trust_to_send_email_messages)
end
def can_export_entity?(entity)