luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-19 21:33:21 +00:00
Code Issues Projects Releases Wiki Activity

When taking action on a report (silence/suspend), it dismisses all other

Browse source 
reports for that user automatically
This commit is contained in:
Eugen Rochko 2017-04-03 19:17:56 +02:00
parent b7c1b12367
commit 71458dc6df
2 changed files with 22 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/admin/reports_controller.rb
View file

@ -22,13 +22,13 @@ class Admin::ReportsController < ApplicationController
def suspend def suspend
Admin::SuspensionWorker.perform_async(@report.target_account.id) Admin::SuspensionWorker.perform_async(@report.target_account.id)
@report.update(action_taken: true) Report.unresolved.where(target_account: @report.target_account).update_all(action_taken: true)
redirect_to admin_report_path(@report) redirect_to admin_report_path(@report)
end end
def silence def silence
@report.target_account.update(silenced: true) @report.target_account.update(silenced: true)
@report.update(action_taken: true) Report.unresolved.where(target_account: @report.target_account).update_all(action_taken: true)
redirect_to admin_report_path(@report) redirect_to admin_report_path(@report)
end end

7
app/views/admin/reports/index.html.haml
View file

@ -8,9 +8,12 @@
%li= filter_link_to 'Unresolved', action_taken: nil %li= filter_link_to 'Unresolved', action_taken: nil
%li= filter_link_to 'Resolved', action_taken: '1' %li= filter_link_to 'Resolved', action_taken: '1'
%table.table = form_tag do
%table.table
%thead %thead
%tr %tr
%th
%th ID %th ID
%th Target %th Target
%th Reported by %th Reported by
@ -19,9 +22,11 @@
%tbody %tbody
- @reports.each do |report| - @reports.each do |report|
%tr %tr
%td= check_box_tag 'select', report.id
%td= "##{report.id}" %td= "##{report.id}"
%td= link_to report.target_account.acct, admin_account_path(report.target_account.id) %td= link_to report.target_account.acct, admin_account_path(report.target_account.id)
%td= link_to report.account.acct, admin_account_path(report.account.id) %td= link_to report.account.acct, admin_account_path(report.account.id)
%td= truncate(report.comment, length: 30, separator: ' ') %td= truncate(report.comment, length: 30, separator: ' ')
%td= table_link_to 'circle', 'View', admin_report_path(report) %td= table_link_to 'circle', 'View', admin_report_path(report)
= will_paginate @reports, pagination_options = will_paginate @reports, pagination_options