diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-05-04 09:42:31 -0500 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-05-04 09:42:31 -0500 |
| commit | 77a92d3260bdfeeb5ef14f53ced3a9d480053e0f (patch) | |
| tree | 950597d12b7433407fb1c7e9fa4947acc53d9d69 /app/views/admin | |
| parent | c511b0f72ab6952e0ce89eb0c601fcb98eedd200 (diff) | |
| parent | 251bbf9728a310353c3957a0ad51a7f641aa0a9e (diff) | |
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts: Gemfile.lock
Diffstat (limited to 'app/views/admin')
| -rw-r--r-- | app/views/admin/reports/_report.html.haml | 5 | ||||
| -rw-r--r-- | app/views/admin/reports/show.html.haml | 9 |
2 files changed, 10 insertions, 4 deletions
diff --git a/app/views/admin/reports/_report.html.haml b/app/views/admin/reports/_report.html.haml index d6c881955..7b25c924b 100644 --- a/app/views/admin/reports/_report.html.haml +++ b/app/views/admin/reports/_report.html.haml @@ -4,7 +4,10 @@ %td.target = admin_account_link_to report.target_account %td.reporter - = admin_account_link_to report.account + - if report.account.local? + = admin_account_link_to report.account + - else + = report.account.domain %td %div{ title: report.comment } = truncate(report.comment, length: 30, separator: ' ') diff --git a/app/views/admin/reports/show.html.haml b/app/views/admin/reports/show.html.haml index cbfbdcfa9..38e47e6ca 100644 --- a/app/views/admin/reports/show.html.haml +++ b/app/views/admin/reports/show.html.haml @@ -23,9 +23,12 @@ %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') - %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) + - if @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) + - else + %td{ colspan: 3 }= @report.account.domain %tr %th= t('admin.reports.created_at') %td{ colspan: 3 } |