Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

post deleted notification regression because controller was agreeing with all flags too early

This commit is contained in:
Neil Lalonde 2018-07-30 16:44:52 -04:00
parent 8f1db615db
commit c12a9279f6
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/admin/flags_controller.rb
View File

@ -77,13 +77,14 @@ class Admin::FlagsController < Admin::AdminController
delete_post = params[:action_on_post] == "delete"
restore_post = params[:action_on_post] == "restore"
PostAction.agree_flags!(post, current_user, delete_post)
if delete_post
# PostDestroy calls PostAction.agree_flags!
PostDestroyer.new(current_user, post).destroy
elsif restore_post
PostAction.agree_flags!(post, current_user, delete_post)
PostDestroyer.new(current_user, post).recover
elsif !keep_post
PostAction.agree_flags!(post, current_user, delete_post)
PostAction.hide_post!(post, post_action_type)
end