diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-10-22 17:51:38 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-10-22 17:51:38 +0200 |
commit | dcded13a996e1b6b87444641eed66fc2d117e1af (patch) | |
tree | 1be2c25853e7196a38b0bebc13e9f5281a24d908 /app/views/admin/reports/show.html.haml | |
parent | 4739e0f090a04235669ef81fa432ae90bb62f4c4 (diff) | |
parent | 4f0bdbaaaf6828d7ee6fd6e6023375b727c0afe5 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - .github/ISSUE_TEMPLATE/bug_report.md Took our version. - CONTRIBUTING.md Updated the embedded copy of upstream's version. - README.md Took our version. - app/policies/status_policy.rb Not a real conflict, took code from both. - app/views/layouts/embedded.html.haml Added upstream's changes (dns-prefetch) and fixed `%body.embed` - app/views/settings/preferences/show.html.haml Reverted some of upstream changes, as we have a page dedicated for flavours and skins. - config/initializers/content_security_policy.rb Kept our version of the CSP. - config/initializers/doorkeeper.rb Not a real conflict, took code from both.
Diffstat (limited to 'app/views/admin/reports/show.html.haml')
-rw-r--r-- | app/views/admin/reports/show.html.haml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/views/admin/reports/show.html.haml b/app/views/admin/reports/show.html.haml index ae0bf81f8..133ca4eca 100644 --- a/app/views/admin/reports/show.html.haml +++ b/app/views/admin/reports/show.html.haml @@ -4,8 +4,10 @@ %div{ style: 'overflow: hidden; margin-bottom: 20px' } - if @report.unresolved? %div{ style: 'float: right' } - = link_to t('admin.reports.silence_account'), admin_report_path(@report, outcome: 'silence'), method: :put, class: 'button' - = link_to t('admin.reports.suspend_account'), new_admin_account_suspension_path(@report.target_account_id, report_id: @report.id), class: 'button' + - if @report.target_account.local? + = link_to t('admin.accounts.disable'), admin_report_path(@report, outcome: 'disable'), method: :put, class: 'button button--destructive' + = link_to t('admin.accounts.silence'), admin_report_path(@report, outcome: 'silence'), method: :put, class: 'button button--destructive' + = link_to t('admin.accounts.perform_full_suspension'), new_admin_account_suspension_path(@report.target_account_id, report_id: @report.id), class: 'button button--destructive' %div{ style: 'float: left' } = link_to t('admin.reports.mark_as_resolved'), admin_report_path(@report, outcome: 'resolve'), method: :put, class: 'button' - else |