mirror of
https://github.com/mastodon/mastodon.git
synced 2024-11-21 20:15:10 +01:00
Feature: add count of account notes to reports (#7130)
* Reports: Colocate account details with reports * Reports: Add count of account moderation notes Sometimes an account will be left with a note instead of the report, this adds a way to quickly see from a given report if this is the case.
This commit is contained in:
parent
ef12a2b74c
commit
204d72fbe4
@ -1,17 +0,0 @@
|
|||||||
.table-wrapper
|
|
||||||
%table.table
|
|
||||||
%tbody
|
|
||||||
%tr
|
|
||||||
%td= t('admin.accounts.show.created_reports')
|
|
||||||
%td= link_to pluralize(account.reports.count, t('admin.accounts.show.report')), admin_reports_path(account_id: account.id)
|
|
||||||
%tr
|
|
||||||
%td= t('admin.accounts.show.targeted_reports')
|
|
||||||
%td= link_to pluralize(account.targeted_reports.count, t('admin.accounts.show.report')), admin_reports_path(target_account_id: account.id)
|
|
||||||
- if account.silenced? || account.suspended?
|
|
||||||
%tr
|
|
||||||
%td= t('admin.accounts.moderation.title')
|
|
||||||
%td
|
|
||||||
- if account.silenced?
|
|
||||||
%p= t('admin.accounts.moderation.silenced')
|
|
||||||
- if account.suspended?
|
|
||||||
%p= t('admin.accounts.moderation.suspended')
|
|
20
app/views/admin/reports/_account_details.html.haml
Normal file
20
app/views/admin/reports/_account_details.html.haml
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
.table-wrapper
|
||||||
|
%table.table
|
||||||
|
%tbody
|
||||||
|
%tr
|
||||||
|
%td= t('admin.reports.account.created_reports')
|
||||||
|
%td= link_to pluralize(account.reports.count, t('admin.reports.account.report')), admin_reports_path(account_id: account.id)
|
||||||
|
%tr
|
||||||
|
%td= t('admin.reports.account.targeted_reports')
|
||||||
|
%td= link_to pluralize(account.targeted_reports.count, t('admin.reports.account.report')), admin_reports_path(target_account_id: account.id)
|
||||||
|
%tr
|
||||||
|
%td= t('admin.reports.account.moderation_notes')
|
||||||
|
%td= link_to pluralize(account.targeted_moderation_notes.count, t('admin.reports.account.note')), admin_reports_path(target_account_id: account.id)
|
||||||
|
- if account.silenced? || account.suspended?
|
||||||
|
%tr
|
||||||
|
%td= t('admin.reports.account.moderation.title')
|
||||||
|
%td
|
||||||
|
- if account.silenced?
|
||||||
|
%p= t('admin.reports.account.moderation.silenced')
|
||||||
|
- if account.suspended?
|
||||||
|
%p= t('admin.reports.account.moderation.suspended')
|
@ -60,11 +60,11 @@
|
|||||||
.report-accounts__item
|
.report-accounts__item
|
||||||
%h3= t('admin.reports.reported_account')
|
%h3= t('admin.reports.reported_account')
|
||||||
= render 'authorize_follows/card', account: @report.target_account, admin: true
|
= render 'authorize_follows/card', account: @report.target_account, admin: true
|
||||||
= render 'admin/accounts/card', account: @report.target_account
|
= render 'admin/reports/account_details', account: @report.target_account
|
||||||
.report-accounts__item
|
.report-accounts__item
|
||||||
%h3= t('admin.reports.reported_by')
|
%h3= t('admin.reports.reported_by')
|
||||||
= render 'authorize_follows/card', account: @report.account, admin: true
|
= render 'authorize_follows/card', account: @report.account, admin: true
|
||||||
= render 'admin/accounts/card', account: @report.account
|
= render 'admin/reports/account_details', account: @report.account
|
||||||
|
|
||||||
%h3= t('admin.reports.comment.label')
|
%h3= t('admin.reports.comment.label')
|
||||||
|
|
||||||
|
@ -259,6 +259,16 @@ en:
|
|||||||
created_msg: Report note successfully created!
|
created_msg: Report note successfully created!
|
||||||
destroyed_msg: Report note successfully deleted!
|
destroyed_msg: Report note successfully deleted!
|
||||||
reports:
|
reports:
|
||||||
|
account:
|
||||||
|
created_reports: Reports created by this account
|
||||||
|
moderation:
|
||||||
|
silenced: Silenced
|
||||||
|
suspended: Suspended
|
||||||
|
title: Moderation
|
||||||
|
moderation_notes: Moderation Notes
|
||||||
|
note: note
|
||||||
|
report: report
|
||||||
|
targeted_reports: Reports made about this account
|
||||||
action_taken_by: Action taken by
|
action_taken_by: Action taken by
|
||||||
are_you_sure: Are you sure?
|
are_you_sure: Are you sure?
|
||||||
assign_to_self: Assign to me
|
assign_to_self: Assign to me
|
||||||
|
Loading…
Reference in New Issue
Block a user