diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-01-15 16:53:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-15 16:53:30 +0100 |
| commit | 13227e1dafd308dfe1a3effc3379b766274809b3 (patch) | |
| tree | c06274b2eaaf6fdb6d1ffb8c2d0ff6b94befdf6b /app/views/admin/reports | |
| parent | afd0d424da4928b9e20a3c7a943f970252ed3a29 (diff) | |
| parent | ab59743c131574076af7fa3640493a866c4528ad (diff) | |
Merge pull request #2081 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
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 | 2 |
2 files changed, 2 insertions, 2 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 181067802..9d1c561d7 100644 --- a/app/views/admin/reports/show.html.haml +++ b/app/views/admin/reports/show.html.haml @@ -177,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' |