forked from treehouse/mastodon
When taking action on a report (silence/suspend), it dismisses all other
reports for that user automaticallyrebase/4.0.0rc2
parent
b7c1b12367
commit
71458dc6df
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -8,20 +8,25 @@
|
||||||
%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
|
||||||
%thead
|
|
||||||
%tr
|
%table.table
|
||||||
%th ID
|
%thead
|
||||||
%th Target
|
|
||||||
%th Reported by
|
|
||||||
%th Comment
|
|
||||||
%th
|
|
||||||
%tbody
|
|
||||||
- @reports.each do |report|
|
|
||||||
%tr
|
%tr
|
||||||
%td= "##{report.id}"
|
%th
|
||||||
%td= link_to report.target_account.acct, admin_account_path(report.target_account.id)
|
%th ID
|
||||||
%td= link_to report.account.acct, admin_account_path(report.account.id)
|
%th Target
|
||||||
%td= truncate(report.comment, length: 30, separator: ' ')
|
%th Reported by
|
||||||
%td= table_link_to 'circle', 'View', admin_report_path(report)
|
%th Comment
|
||||||
|
%th
|
||||||
|
%tbody
|
||||||
|
- @reports.each do |report|
|
||||||
|
%tr
|
||||||
|
%td= check_box_tag 'select', report.id
|
||||||
|
%td= "##{report.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= truncate(report.comment, length: 30, separator: ' ')
|
||||||
|
%td= table_link_to 'circle', 'View', admin_report_path(report)
|
||||||
|
|
||||||
= will_paginate @reports, pagination_options
|
= will_paginate @reports, pagination_options
|
||||||
|
|
Loading…
Reference in New Issue