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

FIX: makes report description optional

Browse Source
This commit is contained in:
Joffrey JAFFEUX 2018-05-14 16:34:56 +02:00 committed by GitHub
parent 83255d94d9
commit 34dbb32df4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/report.rb
View File

@ -35,12 +35,14 @@ class Report
end end
def as_json(options = nil) def as_json(options = nil)
description = I18n.t("reports.#{type}.description", default: "")
{ {
type: type, type: type,
title: I18n.t("reports.#{type}.title"), title: I18n.t("reports.#{type}.title"),
xaxis: I18n.t("reports.#{type}.xaxis"), xaxis: I18n.t("reports.#{type}.xaxis"),
yaxis: I18n.t("reports.#{type}.yaxis"), yaxis: I18n.t("reports.#{type}.yaxis"),
description: I18n.t("reports.#{type}.description"), description: description.presence ? description : nil,
data: data, data: data,
start_date: start_date&.iso8601, start_date: start_date&.iso8601,
end_date: end_date&.iso8601, end_date: end_date&.iso8601,