From e7f0c9f7dad3ae7deceaf289d3cefd41b768efc8 Mon Sep 17 00:00:00 2001 From: Claire Date: Fri, 29 Apr 2022 00:24:44 +0200 Subject: Pre-fill domain block/allow domain from search filter (#18172) --- app/views/admin/instances/index.html.haml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'app/views/admin') diff --git a/app/views/admin/instances/index.html.haml b/app/views/admin/instances/index.html.haml index f8273718d..cc5020398 100644 --- a/app/views/admin/instances/index.html.haml +++ b/app/views/admin/instances/index.html.haml @@ -1,11 +1,14 @@ - content_for :page_title do = t('admin.instances.title') +- content_for :header_tags do + = javascript_pack_tag 'admin', async: true, crossorigin: 'anonymous' + - content_for :heading_actions do - if whitelist_mode? - = link_to t('admin.domain_allows.add_new'), new_admin_domain_allow_path, class: 'button' + = link_to t('admin.domain_allows.add_new'), new_admin_domain_allow_path, class: 'button', id: 'add-instance-button' - else - = link_to t('admin.domain_blocks.add_new'), new_admin_domain_block_path, class: 'button' + = link_to t('admin.domain_blocks.add_new'), new_admin_domain_block_path, class: 'button', id: 'add-instance-button' .filters .filter-subset -- cgit From 5c691430e5f05524523bf32a3fce10633ec37092 Mon Sep 17 00:00:00 2001 From: Claire Date: Fri, 29 Apr 2022 20:25:31 +0200 Subject: Fix error on attempting to delete an account moderation note (#18196) Fixes #18193 --- app/views/admin/report_notes/_report_note.html.haml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'app/views/admin') diff --git a/app/views/admin/report_notes/_report_note.html.haml b/app/views/admin/report_notes/_report_note.html.haml index f9d57c2ae..3bccd3b4b 100644 --- a/app/views/admin/report_notes/_report_note.html.haml +++ b/app/views/admin/report_notes/_report_note.html.haml @@ -15,4 +15,7 @@ - if can?(:destroy, report_note) .report-notes__item__actions - = table_link_to 'trash', t('admin.reports.notes.delete'), admin_report_note_path(report_note), method: :delete + - if report_note.is_a?(AccountModerationNote) + = table_link_to 'trash', t('admin.reports.notes.delete'), admin_account_moderation_note_path(report_note), method: :delete + - else + = table_link_to 'trash', t('admin.reports.notes.delete'), admin_report_note_path(report_note), method: :delete -- cgit