From 794781d1219112482e4abbc0a98683a17d170e2b Mon Sep 17 00:00:00 2001
From: abcang <abcang1015@gmail.com>
Date: Sun, 9 Jul 2017 01:35:08 +0900
Subject: [PATCH] Change account link to admin account link on report page
(#4119)
---
app/views/admin/reports/show.html.haml | 4 ++--
app/views/authorize_follows/_card.html.haml | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/app/views/admin/reports/show.html.haml b/app/views/admin/reports/show.html.haml
index 965b71180..44486cb42 100644
--- a/app/views/admin/reports/show.html.haml
+++ b/app/views/admin/reports/show.html.haml
@@ -4,11 +4,11 @@
.report-accounts
.report-accounts__item
%strong= t('admin.reports.reported_account')
- = render 'authorize_follows/card', account: @report.target_account
+ = render 'authorize_follows/card', account: @report.target_account, admin: true
= render 'admin/accounts/card', account: @report.target_account
.report-accounts__item
%strong= t('admin.reports.reported_by')
- = render 'authorize_follows/card', account: @report.account
+ = render 'authorize_follows/card', account: @report.account, admin: true
= render 'admin/accounts/card', account: @report.account
%p
diff --git a/app/views/authorize_follows/_card.html.haml b/app/views/authorize_follows/_card.html.haml
index 13d9c7719..e81e292ba 100644
--- a/app/views/authorize_follows/_card.html.haml
+++ b/app/views/authorize_follows/_card.html.haml
@@ -4,7 +4,8 @@
= image_tag account.avatar.url(:original), alt: '', width: 48, height: 48, class: 'avatar'
%span.display-name
- = link_to TagManager.instance.url_for(account), class: 'detailed-status__display-name p-author h-card', target: '_blank', rel: 'noopener' do
+ - account_url = local_assigns[:admin] ? admin_account_path(account.id) : TagManager.instance.url_for(account)
+ = link_to account_url, class: 'detailed-status__display-name p-author h-card', target: '_blank', rel: 'noopener' do
%strong.emojify= display_name(account)
%span @#{account.acct}
--
GitLab