github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-31 21:55:25 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FEATURE: initial implementation of generic filters for reports

Browse Source
This commit is contained in:
Joffrey JAFFEUX
2019-04-26 12:17:10 +02:00
committed by GitHub
parent 4b455e741e
commit bcca2b5d73
33 changed files with 361 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/controllers/admin/reports_controller.rb
View File

@ -91,18 +91,6 @@ class Admin::ReportsController < Admin::AdminController
start_date = (report_params[:start_date].present? ? Time.parse(report_params[:start_date]).to_date : 1.days.ago).beginning_of_day
end_date = (report_params[:end_date].present? ? Time.parse(report_params[:end_date]).to_date : start_date + 30.days).end_of_day
if report_params.has_key?(:category_id) && report_params[:category_id].to_i > 0
category_id = report_params[:category_id].to_i
else
category_id = nil
end
if report_params.has_key?(:group_id) && report_params[:group_id].to_i > 0
group_id = report_params[:group_id].to_i
else
group_id = nil
end
facets = nil
if Array === report_params[:facets]
facets = report_params[:facets].map { |s| s.to_s.to_sym }
@ -113,17 +101,15 @@ class Admin::ReportsController < Admin::AdminController
limit = report_params[:limit].to_i
end
filter = nil
if report_params.has_key?(:filter)
filter = report_params[:filter]
filters = nil
if report_params.has_key?(:filters)
filters = report_params[:filters]
end
{
start_date: start_date,
end_date: end_date,
category_id: category_id,
group_id: group_id,
filter: filter,
filters: filters,
facets: facets,
limit: limit
}