diff options
| author | Matt Jankowski <mjankowski@thoughtbot.com> | 2017-04-14 05:10:28 -0400 |
|---|---|---|
| committer | Eugen <eugen@zeonfederated.com> | 2017-04-14 11:10:28 +0200 |
| commit | 8b74aa42176dabf77c3b4d02c80bcc47d9d70e8e (patch) | |
| tree | f39b6c185db42639a6bf43ac8cb4bc621dfc2f20 /app/views | |
| parent | a6807201d2003fc0d544813ba67cfe315d829e06 (diff) | |
Admin reports controller improvements (#1714)
* Simplify admin/reports controller filtering for index * Rename parameter to resolved * Fix issue where reports view could not access filter_link_to * Add coverage for admin/reports controller * DRY up resolution of related reports for target account * Clean up admin/reports routes * Add Report#statuses method * DRY up current account action taken params * Rubocop styles
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/admin/reports/index.html.haml | 4 | ||||
| -rw-r--r-- | app/views/admin/reports/show.html.haml | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/app/views/admin/reports/index.html.haml b/app/views/admin/reports/index.html.haml index d5deec8f6..7309c719a 100644 --- a/app/views/admin/reports/index.html.haml +++ b/app/views/admin/reports/index.html.haml @@ -5,8 +5,8 @@ .filter-subset %strong= t('admin.reports.status') %ul - %li= filter_link_to t('admin.reports.unresolved'), action_taken: nil - %li= filter_link_to t('admin.reports.resolved'), action_taken: '1' + %li= filter_link_to t('admin.reports.unresolved'), resolved: nil + %li= filter_link_to t('admin.reports.resolved'), resolved: '1' = form_tag do diff --git a/app/views/admin/reports/show.html.haml b/app/views/admin/reports/show.html.haml index a7430f396..5391d99a8 100644 --- a/app/views/admin/reports/show.html.haml +++ b/app/views/admin/reports/show.html.haml @@ -14,15 +14,15 @@ \: = @report.comment.presence || t('reports.comment.none') -- unless @statuses.empty? +- unless @report.statuses.empty? %hr/ - - @statuses.each do |status| + - @report.statuses.each do |status| .report-status .activity-stream.activity-stream-headless .entry= render partial: 'stream_entries/simple_status', locals: { status: status } .report-status__actions - = link_to remove_admin_report_path(@report, status_id: status.id), method: :post, class: 'icon-button', style: 'font-size: 24px; width: 24px; height: 24px', title: t('admin.reports.delete') do + = link_to admin_report_reported_status_path(@report, status), method: :delete, class: 'icon-button', style: 'font-size: 24px; width: 24px; height: 24px', title: t('admin.reports.delete') do = fa_icon 'trash' - if !@report.action_taken? @@ -30,10 +30,10 @@ %div{ style: 'overflow: hidden' } %div{ style: 'float: right' } - = link_to t('admin.reports.silence_account'), silence_admin_report_path(@report), method: :post, class: 'button' - = link_to t('admin.reports.suspend_account'), suspend_admin_report_path(@report), method: :post, class: 'button' + = link_to t('admin.reports.silence_account'), admin_report_path(@report, outcome: 'silence'), method: :put, class: 'button' + = link_to t('admin.reports.suspend_account'), admin_report_path(@report, outcome: 'suspend'), method: :put, class: 'button' %div{ style: 'float: left' } - = link_to t('admin.reports.mark_as_resolved'), resolve_admin_report_path(@report), method: :post, class: 'button' + = link_to t('admin.reports.mark_as_resolved'), admin_report_path(@report, outcome: 'resolve'), method: :put, class: 'button' - elsif !@report.action_taken_by_account.nil? %hr/ |