github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-23 11:41:03 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

avoid async report pattern and replace with simpler hijack

Browse Source
This commit is contained in:
Sam
2018-05-16 16:05:03 +10:00
parent 3864091f2d
commit 21e0b7c818
7 changed files with 51 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,18 +32,36 @@ class Admin::ReportsController < Admin::AdminController
limit = params[:limit].to_i
end
report = Report.find(report_type,
start_date: start_date,
end_date: end_date,
category_id: category_id,
group_id: group_id,
facets: facets,
limit: limit,
async: params[:async])
args = {
start_date: start_date,
end_date: end_date,
category_id: category_id,
group_id: group_id,
facets: facets,
limit: limit
}
raise Discourse::NotFound if report.blank?
report = nil
if (params[:cache])
report = Report.find_cached(report_type, args)
end
if report
return render_json_dump(report: report)
end
hijack do
report = Report.find(report_type, args)
raise Discourse::NotFound if report.blank?
if (params[:cache])
Report.cache(report, 35.minutes)
end
render_json_dump(report: report)
end
render_json_dump(report: report)
end
end