IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2026-09-05 04:40:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

dashboard next: caching, mobile support and new charts

Browse Source
This commit is contained in:
Joffrey JAFFEUX
2018-05-03 15:41:41 +02:00
committed by GitHub
parent c718c59b5d
commit 980972182f
39 changed files with 819 additions and 545 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/admin/reports_controller.rb
+8 -3
View File
@@ -7,8 +7,8 @@ class Admin::ReportsController < Admin::AdminController
raise Discourse::NotFound unless report_type =~ /^[a-z0-9\_]+$/
start_date = (params[:start_date].present? ? Time.zone.parse(params[:start_date]) : 30.days.ago).beginning_of_day
end_date = (params[:end_date].present? ? Time.zone.parse(params[:end_date]) : start_date + 30.days).end_of_day
start_date = (params[:start_date].present? ? params[:start_date].to_date : 30.days.ago).beginning_of_day
end_date = (params[:end_date].present? ? params[:end_date].to_date : start_date + 30.days).end_of_day
if params.has_key?(:category_id) && params[:category_id].to_i > 0
category_id = params[:category_id].to_i
@@ -22,7 +22,12 @@ class Admin::ReportsController < Admin::AdminController
group_id = nil
end
report = Report.find(report_type, start_date: start_date, end_date: end_date, category_id: category_id, group_id: group_id)
report = Report.find(report_type,
start_date: start_date,
end_date: end_date,
category_id: category_id,
group_id: group_id,
async: params[:async])
raise Discourse::NotFound if report.blank?