mirror of
https://github.com/discourse/discourse.git
synced 2025-05-26 06:17:00 +08:00
DEV: Apply syntax_tree formatting to app/*
This commit is contained in:
@ -2,24 +2,28 @@
|
||||
|
||||
class Admin::ReportsController < Admin::StaffController
|
||||
def index
|
||||
reports_methods = ['page_view_total_reqs'] +
|
||||
ApplicationRequest.req_types.keys
|
||||
.select { |r| r =~ /^page_view_/ && r !~ /mobile/ }
|
||||
.map { |r| r + "_reqs" } +
|
||||
Report.singleton_methods.grep(/^report_(?!about|storage_stats)/)
|
||||
reports_methods =
|
||||
["page_view_total_reqs"] +
|
||||
ApplicationRequest
|
||||
.req_types
|
||||
.keys
|
||||
.select { |r| r =~ /^page_view_/ && r !~ /mobile/ }
|
||||
.map { |r| r + "_reqs" } +
|
||||
Report.singleton_methods.grep(/^report_(?!about|storage_stats)/)
|
||||
|
||||
reports = reports_methods.map do |name|
|
||||
type = name.to_s.gsub('report_', '')
|
||||
description = I18n.t("reports.#{type}.description", default: '')
|
||||
description_link = I18n.t("reports.#{type}.description_link", default: '')
|
||||
reports =
|
||||
reports_methods.map do |name|
|
||||
type = name.to_s.gsub("report_", "")
|
||||
description = I18n.t("reports.#{type}.description", default: "")
|
||||
description_link = I18n.t("reports.#{type}.description_link", default: "")
|
||||
|
||||
{
|
||||
type: type,
|
||||
title: I18n.t("reports.#{type}.title"),
|
||||
description: description.presence ? description : nil,
|
||||
description_link: description_link.presence ? description_link : nil
|
||||
}
|
||||
end
|
||||
{
|
||||
type: type,
|
||||
title: I18n.t("reports.#{type}.title"),
|
||||
description: description.presence ? description : nil,
|
||||
description_link: description_link.presence ? description_link : nil,
|
||||
}
|
||||
end
|
||||
|
||||
render_json_dump(reports: reports.sort_by { |report| report[:title] })
|
||||
end
|
||||
@ -32,18 +36,14 @@ class Admin::ReportsController < Admin::StaffController
|
||||
args = parse_params(report_params)
|
||||
|
||||
report = nil
|
||||
if (report_params[:cache])
|
||||
report = Report.find_cached(report_type, args)
|
||||
end
|
||||
report = Report.find_cached(report_type, args) if (report_params[:cache])
|
||||
|
||||
if report
|
||||
reports << report
|
||||
else
|
||||
report = Report.find(report_type, args)
|
||||
|
||||
if (report_params[:cache]) && report
|
||||
Report.cache(report)
|
||||
end
|
||||
Report.cache(report) if (report_params[:cache]) && report
|
||||
|
||||
if report.blank?
|
||||
report = Report._get(report_type, args)
|
||||
@ -66,22 +66,16 @@ class Admin::ReportsController < Admin::StaffController
|
||||
args = parse_params(params)
|
||||
|
||||
report = nil
|
||||
if (params[:cache])
|
||||
report = Report.find_cached(report_type, args)
|
||||
end
|
||||
report = Report.find_cached(report_type, args) if (params[:cache])
|
||||
|
||||
if report
|
||||
return render_json_dump(report: report)
|
||||
end
|
||||
return render_json_dump(report: report) if report
|
||||
|
||||
hijack do
|
||||
report = Report.find(report_type, args)
|
||||
|
||||
raise Discourse::NotFound if report.blank?
|
||||
|
||||
if (params[:cache])
|
||||
Report.cache(report)
|
||||
end
|
||||
Report.cache(report) if (params[:cache])
|
||||
|
||||
render_json_dump(report: report)
|
||||
end
|
||||
@ -91,16 +85,28 @@ class Admin::ReportsController < Admin::StaffController
|
||||
|
||||
def parse_params(report_params)
|
||||
begin
|
||||
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
|
||||
start_date =
|
||||
(
|
||||
if report_params[:start_date].present?
|
||||
Time.parse(report_params[:start_date]).to_date
|
||||
else
|
||||
1.days.ago
|
||||
end
|
||||
).beginning_of_day
|
||||
end_date =
|
||||
(
|
||||
if report_params[:end_date].present?
|
||||
Time.parse(report_params[:end_date]).to_date
|
||||
else
|
||||
start_date + 30.days
|
||||
end
|
||||
).end_of_day
|
||||
rescue ArgumentError => e
|
||||
raise Discourse::InvalidParameters.new(e.message)
|
||||
end
|
||||
|
||||
facets = nil
|
||||
if Array === report_params[:facets]
|
||||
facets = report_params[:facets].map { |s| s.to_s.to_sym }
|
||||
end
|
||||
facets = report_params[:facets].map { |s| s.to_s.to_sym } if Array === report_params[:facets]
|
||||
|
||||
limit = nil
|
||||
if report_params.has_key?(:limit) && report_params[:limit].to_i > 0
|
||||
@ -108,16 +114,8 @@ class Admin::ReportsController < Admin::StaffController
|
||||
end
|
||||
|
||||
filters = nil
|
||||
if report_params.has_key?(:filters)
|
||||
filters = report_params[:filters]
|
||||
end
|
||||
filters = report_params[:filters] if report_params.has_key?(:filters)
|
||||
|
||||
{
|
||||
start_date: start_date,
|
||||
end_date: end_date,
|
||||
filters: filters,
|
||||
facets: facets,
|
||||
limit: limit
|
||||
}
|
||||
{ start_date: start_date, end_date: end_date, filters: filters, facets: facets, limit: limit }
|
||||
end
|
||||
end
|
||||
|
Reference in New Issue
Block a user