diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-05-01 16:52:27 +0200 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-05-01 16:52:27 +0200 |
| commit | 392ca0472a50ea930f46e22dccf5ce55b04ef588 (patch) | |
| tree | 9f8c6b3dcb11a620a417205f9554e8d37e5f3e12 /app/views/admin/report_notes/_report_note.html.haml | |
| parent | 252deefe3433d0cedafd973becd0d85b5182eb49 (diff) | |
| parent | 33f3818d660c67194f94c7ff2bb180f4865e6748 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/javascript/packs/admin.js`: Conflicts due to glitch-soc's theming system. Upstream changes have been ported to `app/javascript/core/admin.js` - `app/models/trends/statuses.rb`: Minor conflict due to glitch-soc's option to allow CWed toots in trends. Ported upstream changes.
Diffstat (limited to 'app/views/admin/report_notes/_report_note.html.haml')
| -rw-r--r-- | app/views/admin/report_notes/_report_note.html.haml | 5 |
1 files changed, 4 insertions, 1 deletions
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 |