about summary refs log tree commit diff
path: root/app/controllers/admin
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2018-10-20 02:39:39 +0200
committerGitHub <noreply@github.com>2018-10-20 02:39:39 +0200
commit9486f0ca7774a148845a45db74ae8527cc963e85 (patch)
treefbf167deba3b5deef9f1b92d24846f51fcb13bf4 /app/controllers/admin
parent369cc5f555821d823d4daf7aab3142cdac896a69 (diff)
Add "disable" button to report screen (#9024)
* Add "disable" button to report screen

* i18n-tasks remove-unused
Diffstat (limited to 'app/controllers/admin')
-rw-r--r--app/controllers/admin/reports_controller.rb9
1 files changed, 9 insertions, 0 deletions
diff --git a/app/controllers/admin/reports_controller.rb b/app/controllers/admin/reports_controller.rb
index 5d7f43e00..e97ddb9b6 100644
--- a/app/controllers/admin/reports_controller.rb
+++ b/app/controllers/admin/reports_controller.rb
@@ -44,6 +44,14 @@ module Admin
       when 'resolve'
         @report.resolve!(current_account)
         log_action :resolve, @report
+      when 'disable'
+        @report.resolve!(current_account)
+        @report.target_account.user.disable!
+
+        log_action :resolve, @report
+        log_action :disable, @report.target_account.user
+
+        resolve_all_target_account_reports
       when 'silence'
         @report.resolve!(current_account)
         @report.target_account.update!(silenced: true)
@@ -55,6 +63,7 @@ module Admin
       else
         raise ActiveRecord::RecordNotFound
       end
+
       @report.reload
     end