diff options
| author | David Yip <yipdw@member.fsf.org> | 2017-12-04 11:07:01 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2017-12-04 11:07:01 -0600 |
| commit | d9800a5647cbc57db7679094b2271f8eb5ec328b (patch) | |
| tree | f9210c465de5f9d80e294d9ffa8536f98f9c466e /app/controllers/admin/reports_controller.rb | |
| parent | 1c74ede69e7a9916c19da6f05daa215231eba81c (diff) | |
| parent | f2f2f1032082d6212771bd0307136484f671d37e (diff) | |
Merge branch 'gs-master' into glitch-theme
Diffstat (limited to 'app/controllers/admin/reports_controller.rb')
| -rw-r--r-- | app/controllers/admin/reports_controller.rb | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/app/controllers/admin/reports_controller.rb b/app/controllers/admin/reports_controller.rb index 745757ee8..75db6b78a 100644 --- a/app/controllers/admin/reports_controller.rb +++ b/app/controllers/admin/reports_controller.rb @@ -25,12 +25,17 @@ module Admin def process_report case params[:outcome].to_s when 'resolve' - @report.update(action_taken_by_current_attributes) + @report.update!(action_taken_by_current_attributes) + log_action :resolve, @report when 'suspend' Admin::SuspensionWorker.perform_async(@report.target_account.id) + log_action :resolve, @report + log_action :suspend, @report.target_account resolve_all_target_account_reports when 'silence' - @report.target_account.update(silenced: true) + @report.target_account.update!(silenced: true) + log_action :resolve, @report + log_action :silence, @report.target_account resolve_all_target_account_reports else raise ActiveRecord::RecordNotFound |