Add ability to filter reports by origin of target account (#16487)

master
Eugen Rochko 3 years ago committed by GitHub
parent ca8ac1a639
commit 7095c80373
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 14
      app/models/report_filter.rb
  2. 6
      app/views/admin/reports/index.html.haml
  3. 1
      config/locales/en.yml

@ -6,6 +6,7 @@ class ReportFilter
account_id
target_account_id
by_target_domain
target_origin
).freeze
attr_reader :params
@ -34,8 +35,21 @@ class ReportFilter
Report.where(account_id: value)
when :target_account_id
Report.where(target_account_id: value)
when :target_origin
target_origin_scope(value)
else
raise "Unknown filter: #{key}"
end
end
def target_origin_scope(value)
case value.to_sym
when :local
Report.where(target_account: Account.local)
when :remote
Report.where(target_account: Account.remote)
else
raise "Unknown value: #{value}"
end
end
end

@ -7,6 +7,12 @@
%ul
%li= filter_link_to t('admin.reports.unresolved'), resolved: nil
%li= filter_link_to t('admin.reports.resolved'), resolved: '1'
.filter-subset
%strong= t('admin.reports.target_origin')
%ul
%li= filter_link_to t('admin.accounts.location.all'), target_origin: nil
%li= filter_link_to t('admin.accounts.location.local'), target_origin: 'local'
%li= filter_link_to t('admin.accounts.location.remote'), target_origin: 'remote'
= form_tag admin_reports_url, method: 'GET', class: 'simple_form' do
.fields-group

@ -579,6 +579,7 @@ en:
resolved: Resolved
resolved_msg: Report successfully resolved!
status: Status
target_origin: Origin of reported account
title: Reports
unassign: Unassign
unresolved: Unresolved

Loading…
Cancel
Save