diff options
| author | Starfall <us@starfall.systems> | 2023-01-17 11:41:05 -0600 |
|---|---|---|
| committer | Starfall <us@starfall.systems> | 2023-01-17 11:41:05 -0600 |
| commit | 1f9c919b8769f5b0a3424ef343e0049d33d656e3 (patch) | |
| tree | 1853486629da4b3b76192fe8756e8d4f6d71adcb /app/views/admin/reports | |
| parent | 957c21273ff42d5b2b4a5e16b7869bbb09aeb865 (diff) | |
| parent | 13227e1dafd308dfe1a3effc3379b766274809b3 (diff) | |
Merge remote-tracking branch 'glitch/main'
Diffstat (limited to 'app/views/admin/reports')
| -rw-r--r-- | app/views/admin/reports/_actions.html.haml | 2 | ||||
| -rw-r--r-- | app/views/admin/reports/show.html.haml | 9 |
2 files changed, 4 insertions, 7 deletions
diff --git a/app/views/admin/reports/_actions.html.haml b/app/views/admin/reports/_actions.html.haml index 404d53a77..486eb486c 100644 --- a/app/views/admin/reports/_actions.html.haml +++ b/app/views/admin/reports/_actions.html.haml @@ -5,7 +5,7 @@ = link_to t('admin.reports.mark_as_resolved'), resolve_admin_report_path(@report), method: :post, class: 'button' .report-actions__item__description = t('admin.reports.actions.resolve_description_html') - - if @statuses.any? { |status| status.with_media? || status.with_preview_card? } + - if @statuses.any? { |status| (status.with_media? || status.with_preview_card?) && !status.discarded? } .report-actions__item .report-actions__item__button = button_tag t('admin.reports.mark_as_sensitive'), name: :mark_as_sensitive, class: 'button' diff --git a/app/views/admin/reports/show.html.haml b/app/views/admin/reports/show.html.haml index e5ea56779..9d1c561d7 100644 --- a/app/views/admin/reports/show.html.haml +++ b/app/views/admin/reports/show.html.haml @@ -140,11 +140,8 @@ = link_to @report.account.username, admin_account_path(@report.account_id) - else = link_to @report.account.domain, admin_instance_path(@report.account.domain) - %time{ datetime: @report.created_at.iso8601, title: l(@report.created_at) } - - if @report.created_at.today? - = t('admin.report_notes.today_at', time: l(@report.created_at, format: :time)) - - else - = l @report.created_at.to_date + %time.relative-formatted{ datetime: @report.created_at.iso8601 } + = l @report.created_at.to_date .report-notes__item__content = simple_format(h(@report.comment)) @@ -180,7 +177,7 @@ - if @report.unresolved? %hr.spacer/ - %p#actions= t 'admin.reports.actions_description_html' + %p#actions= t(@report.target_account.local? ? 'admin.reports.actions_description_html' : 'admin.reports.actions_description_remote_html') = render partial: 'admin/reports/actions' |