From c12a9279f6182df2ca72d200c324d97b0ea6c220 Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Mon, 30 Jul 2018 16:44:52 -0400 Subject: [PATCH] post deleted notification regression because controller was agreeing with all flags too early --- app/controllers/admin/flags_controller.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/controllers/admin/flags_controller.rb b/app/controllers/admin/flags_controller.rb index 43c6cf129fa..8924cc96616 100644 --- a/app/controllers/admin/flags_controller.rb +++ b/app/controllers/admin/flags_controller.rb @@ -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