From c9228edcfcbcb3017bfcf362619120ed41c4eb16 Mon Sep 17 00:00:00 2001 From: Prateeksha Singh Date: Tue, 17 Jul 2018 16:02:10 +0530 Subject: [PATCH] [fix][report] filters_by_name initialization --- frappe/desk/query_report.py | 8 ++------ frappe/public/js/frappe/views/reports/query_report.js | 7 +++++-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/frappe/desk/query_report.py b/frappe/desk/query_report.py index ff23470168..3f6bad7d6e 100644 --- a/frappe/desk/query_report.py +++ b/frappe/desk/query_report.py @@ -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: diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js index 38d59b7f34..40c8f8f8cd 100644 --- a/frappe/public/js/frappe/views/reports/query_report.js +++ b/frappe/public/js/frappe/views/reports/query_report.js @@ -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]; } }