From ad1a46875ebeb72b684452198353d0dfd46216ea Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Fri, 13 Jul 2018 12:40:42 +0530
Subject: [PATCH] [fix] frappe.query_report should be null if report is not
 initialized

---
 .../js/frappe/views/reports/query_report.js   | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js
index 172c460dc5..a8729ed384 100644
--- a/frappe/public/js/frappe/views/reports/query_report.js
+++ b/frappe/public/js/frappe/views/reports/query_report.js
@@ -168,17 +168,6 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 		} else {
 			this.page.show_form();
 		}
-
-		// set the field 'query_report_filters_by_name' first
-		// as they can be used in
-		// setting/triggering the filters
-		this.set_filters_by_name();
-	}
-
-	set_filters_by_name() {
-		for (var i in this.filters) {
-			frappe.query_report_filters_by_name[this.filters[i].df.fieldname] = this.filters[i];
-		}
 	}
 
 	set_route_filters() {
@@ -202,7 +191,6 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 
 	clear_filters() {
 		this.page.clear_fields();
-		frappe.query_report_filters_by_name = {};
 	}
 
 	refresh() {
@@ -610,3 +598,13 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 		return this.get_filter_values;
 	}
 };
+
+Object.defineProperty(frappe, 'query_report_filters_by_name', {
+	get() {
+		if (!frappe.query_report.filters) return null;
+		return frappe.query_report.filters.reduce((f, acc) => {
+			acc[f.df.fieldname] = f;
+			return acc;
+		}, {});
+	}
+});