diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-01-13 10:46:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-13 10:46:52 +0100 |
| commit | 21a1a8ee887f82cb36b3d21011a0235e7bfc8e45 (patch) | |
| tree | 38c6262948a0d1cd84b8a00e7d7901172428bc6e /app/views/admin | |
| parent | a3a5aa159783c7361771a32b97030f05fb40e574 (diff) | |
Fix crash when marking statuses as sensitive while some statuses are deleted (#22134)
* Do not offer to mark statuses as sensitive if there is no undeleted status with media attachments * Fix crash when marking statuses as sensitive while some statuses are deleted Fixes #21910 * Fix multiple strikes being created for a single report when selecting “Mark as sensitive” * Add tests
Diffstat (limited to 'app/views/admin')
| -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' |