diff options
author | Claire <claire.github-309c@sitedethib.com> | 2023-01-14 22:34:09 +0100 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2023-01-14 22:34:09 +0100 |
commit | ab59743c131574076af7fa3640493a866c4528ad (patch) | |
tree | c06274b2eaaf6fdb6d1ffb8c2d0ff6b94befdf6b /app/views/admin/reports/_actions.html.haml | |
parent | afd0d424da4928b9e20a3c7a943f970252ed3a29 (diff) | |
parent | d66dfc7b3c1b62a0d5276387ea8745da598afacc (diff) |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/views/layouts/mailer.html.haml`: Upstream removed a line close to one modified by glitch-soc. Removed the line as upstream did.
Diffstat (limited to 'app/views/admin/reports/_actions.html.haml')
-rw-r--r-- | app/views/admin/reports/_actions.html.haml | 2 |
1 files changed, 1 insertions, 1 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' |