github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-24 01:22:36 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Do not hide posts automatically when flagged by staff user

Browse Source
This commit is contained in:
Vinoth Kannan 2019-01-18 01:33:55 +05:30
parent 3c987132cb
commit 2818afb267
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/models/post_action.rb
View File

@ -613,6 +613,7 @@ class PostAction < ActiveRecord::Base
elsif PostActionType.auto_action_flag_types.include?(post_action_type)
if acting_user.has_trust_level?(TrustLevel[4]) &&
!acting_user.staff? &&
post.user&.trust_level != TrustLevel[4]
hide_post!(post, post_action_type, Post.hidden_reasons[:flagged_by_tl4_user])

6
spec/models/post_action_spec.rb
View File

@ -824,6 +824,12 @@ describe PostAction do
expect(post.hidden).to be_falsey
post = create_post(user: user)
PostAction.act(Fabricate(:moderator), post, post_action_type)
post.reload
expect(post.hidden).to be_falsey
user = Fabricate(:trust_level_4)
post = create_post(user: user)
PostAction.act(tl4_user, post, post_action_type)