cybrespace
/
mastodon
4
3
Fork 3
Code Issues 7 Pull Requests Releases Activity

Fix display of instance actor in reports UI (#11798)

This commit is contained in:
Eugen Rochko 2019-09-09 20:42:43 +02:00 committed by GitHub
parent ec2a439a22
commit 14d4a783cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/admin/reports/index.html.haml
View File

@ -28,7 +28,9 @@
- reports.each do |report| - reports.each do |report|
.report-card__summary__item .report-card__summary__item
.report-card__summary__item__reported-by .report-card__summary__item__reported-by
- if report.account.local? - if report.account.instance_actor?
= site_hostname
- elsif report.account.local?
= admin_account_link_to report.account = admin_account_link_to report.account
- else - else
= report.account.domain = report.account.domain

4
app/views/admin/reports/show.html.haml
View File

@ -29,7 +29,9 @@
%td= table_link_to 'file', pluralize(@report.target_account.targeted_moderation_notes.count, t('admin.reports.account.note')), admin_reports_path(target_account_id: @report.target_account.id) %td= table_link_to 'file', pluralize(@report.target_account.targeted_moderation_notes.count, t('admin.reports.account.note')), admin_reports_path(target_account_id: @report.target_account.id)
%tr %tr
%th= t('admin.reports.reported_by') %th= t('admin.reports.reported_by')
- if @report.account.local? - if @report.account.instance_actor?
%td{ colspan: 3 }= site_hostname
- elsif @report.account.local?
%td= admin_account_link_to @report.account %td= admin_account_link_to @report.account
%td= table_link_to 'flag', pluralize(@report.account.targeted_reports.count, t('admin.reports.account.report')), admin_reports_path(target_account_id: @report.account.id) %td= table_link_to 'flag', pluralize(@report.account.targeted_reports.count, t('admin.reports.account.report')), admin_reports_path(target_account_id: @report.account.id)
%td= table_link_to 'file', pluralize(@report.account.targeted_moderation_notes.count, t('admin.reports.account.note')), admin_reports_path(target_account_id: @report.account.id) %td= table_link_to 'file', pluralize(@report.account.targeted_moderation_notes.count, t('admin.reports.account.note')), admin_reports_path(target_account_id: @report.account.id)