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 #4137 from cpradio/add-warning-to-flag

Browse Source 
FEATURE: Add warning input to flag dialog when notifying a user
This commit is contained in:
Sam
2016-04-15 16:23:22 +10:00
parent 0119a2f980 67cd08af9b
commit 9e50f36c50
10 changed files with 72 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/guardian/post_guardian.rb
View File

@@ -32,6 +32,9 @@ module PostGuardian
# new users can't notify_user because they are not allowed to send private messages
not(action_key == :notify_user && !@user.has_trust_level?(SiteSetting.min_trust_to_send_messages)) &&
# non-staff can't send an official warning
not(action_key == :notify_user && !is_staff? && opts[:is_warning].present? && opts[:is_warning] == 'true') &&
# can't send private messages if they're disabled globally
not(action_key == :notify_user && !SiteSetting.enable_private_messages) &&