From 14d4a783cda4dd58e61bace172c3bebbe01d2ece Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 9 Sep 2019 20:42:43 +0200
Subject: [PATCH] Fix display of instance actor in reports UI (#11798)
---
app/views/admin/reports/index.html.haml | 4 +++-
app/views/admin/reports/show.html.haml | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/app/views/admin/reports/index.html.haml b/app/views/admin/reports/index.html.haml
index d73faccb0d..bfbd32108e 100644
--- a/app/views/admin/reports/index.html.haml
+++ b/app/views/admin/reports/index.html.haml
@@ -28,7 +28,9 @@
- reports.each do |report|
.report-card__summary__item
.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
- else
= report.account.domain
diff --git a/app/views/admin/reports/show.html.haml b/app/views/admin/reports/show.html.haml
index 863dada9e2..bbe83c979a 100644
--- a/app/views/admin/reports/show.html.haml
+++ b/app/views/admin/reports/show.html.haml
@@ -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)
%tr
%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= 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)
--
GitLab