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

trust staged accounts when validating posts

Browse Source
This commit is contained in:
Régis Hanol
2015-11-30 19:08:35 +01:00
parent dd28a3c63a
commit 7c694139ec
2 changed files with 28 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/validators/post_validator.rb
View File

@ -17,8 +17,8 @@ class Validators::PostValidator < ActiveModel::Validator
end
def presence(post)
post.errors.add(:raw, :blank, options) if post.raw.blank?
unless options[:skip_topic]
post.errors.add(:topic_id, :blank, options) if post.topic_id.blank?
end
@ -32,7 +32,7 @@ class Validators::PostValidator < ActiveModel::Validator
range = if post.topic.try(:private_message?)
# private message
SiteSetting.private_message_post_length
elsif ( post.is_first_post? || (post.topic.present? && post.topic.posts_count == 0) )
elsif post.is_first_post? || (post.topic.present? && post.topic.posts_count == 0)
# creating/editing first post
SiteSetting.first_post_length
else
@ -95,7 +95,7 @@ class Validators::PostValidator < ActiveModel::Validator
private
def acting_user_is_trusted?(post)
post.acting_user.present? && post.acting_user.has_trust_level?(TrustLevel[1])
post.acting_user.present? && (post.acting_user.has_trust_level?(TrustLevel[1]) || post.acting_user.staged?)
end
def add_error_if_count_exceeded(post, not_allowed_translation_key, limit_translation_key, current_count, max_count)