diff options
| author | Starfall <us@starfall.systems> | 2022-05-04 12:00:22 -0500 |
|---|---|---|
| committer | Starfall <us@starfall.systems> | 2022-05-04 12:00:22 -0500 |
| commit | e9b2e11520056d0ec822ac0862923d00c6a1289c (patch) | |
| tree | 53b22a4fecda9846fc6c77cf4067c071a6287df0 /app/views | |
| parent | 9ec0ecda66745c892961a917b18354f42dfc1f19 (diff) | |
| parent | 58ac5ae643dc57ffd20017c54e7be523deaef156 (diff) | |
Merge remote-tracking branch 'glitch/main'
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/admin/instances/index.html.haml | 4 | ||||
| -rw-r--r-- | app/views/admin/report_notes/_report_note.html.haml | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/app/views/admin/instances/index.html.haml b/app/views/admin/instances/index.html.haml index f8273718d..ee1b3d0ce 100644 --- a/app/views/admin/instances/index.html.haml +++ b/app/views/admin/instances/index.html.haml @@ -3,9 +3,9 @@ - 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 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 |