vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

[fix][report] filters_by_name initialization

Browse source
This commit is contained in:
Prateeksha Singh 2018-07-17 16:02:10 +05:30
parent 397a0b624c
commit c9228edcfc
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
frappe/desk/query_report.py
View file

@ -60,12 +60,8 @@ def generate_report_result(report, filters=None, user=None):
res = []
# The JOB:
try:
res = frappe.get_attr(method_name)(frappe._dict(filters))
except Exception:
frappe.db.set_value('Report', report.name, 'prepared_report', 1)
frappe.throw("The report to too long to load. Please reload the page to generate it in background.")
# The JOB
res = frappe.get_attr(method_name)(frappe._dict(filters))
columns, result = res[0], res[1]
if len(res) > 2:

7
frappe/public/js/frappe/views/reports/query_report.js
View file

@ -195,9 +195,12 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
}
set_filters_by_name() {
frappe.query_report_filters_by_name = {};
let filters = frappe.query_report_filters_by_name;
if(!filters) {
filters = {};
}
for (var i in this.filters) {
frappe.query_report_filters_by_name[this.filters[i].df.fieldname] = this.filters[i];
filters[this.filters[i].df.fieldname] = this.filters[i];
}
}