ar
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change account link to admin account link on report page (#4119)

rebase/4.0.0rc2
abcang 2017-07-09 01:35:08 +09:00 committed by Eugen Rochko
parent 91cacb1e8f
commit 794781d121
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,11 +4,11 @@
.report-accounts .report-accounts
.report-accounts__item .report-accounts__item
%strong= t('admin.reports.reported_account') %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 = render 'admin/accounts/card', account: @report.target_account
.report-accounts__item .report-accounts__item
%strong= t('admin.reports.reported_by') %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 = render 'admin/accounts/card', account: @report.account
%p %p

3
app/views/authorize_follows/_card.html.haml
View File

@ -4,7 +4,8 @@
= image_tag account.avatar.url(:original), alt: '', width: 48, height: 48, class: 'avatar' = image_tag account.avatar.url(:original), alt: '', width: 48, height: 48, class: 'avatar'
%span.display-name %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) %strong.emojify= display_name(account)
%span @#{account.acct} %span @#{account.acct}