Don't allow users to auto-hide staff posts
This commit is contained in:
parent
b31e6e64fb
commit
cee3337357
|
@ -538,7 +538,7 @@ SQL
|
||||||
end
|
end
|
||||||
|
|
||||||
def self.auto_hide_if_needed(acting_user, post, post_action_type)
|
def self.auto_hide_if_needed(acting_user, post, post_action_type)
|
||||||
return if post.hidden
|
return if post.hidden || post.user.staff?
|
||||||
|
|
||||||
if post_action_type == :spam &&
|
if post_action_type == :spam &&
|
||||||
acting_user.has_trust_level?(TrustLevel[3]) &&
|
acting_user.has_trust_level?(TrustLevel[3]) &&
|
||||||
|
|
|
@ -362,6 +362,22 @@ describe PostAction do
|
||||||
expect(post.spam_count).to eq(0)
|
expect(post.spam_count).to eq(0)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
it "will not auto hide staff posts" do
|
||||||
|
mod = Fabricate(:moderator)
|
||||||
|
post = Fabricate(:post, user: mod)
|
||||||
|
|
||||||
|
SiteSetting.flags_required_to_hide_post = 2
|
||||||
|
Discourse.stubs(:site_contact_user).returns(admin)
|
||||||
|
|
||||||
|
PostAction.act(eviltrout, post, PostActionType.types[:spam])
|
||||||
|
PostAction.act(Fabricate(:walter_white), post, PostActionType.types[:spam])
|
||||||
|
|
||||||
|
post.reload
|
||||||
|
|
||||||
|
expect(post.hidden).to eq(false)
|
||||||
|
expect(post.hidden_at).to be_blank
|
||||||
|
end
|
||||||
|
|
||||||
it 'should follow the rules for automatic hiding workflow' do
|
it 'should follow the rules for automatic hiding workflow' do
|
||||||
post = create_post
|
post = create_post
|
||||||
walterwhite = Fabricate(:walter_white)
|
walterwhite = Fabricate(:walter_white)
|
||||||
|
|
Loading…
Reference in New Issue