From 78ed1b75dfd37716b8373041f7eede182027f5b2 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 7 Mar 2017 17:14:12 +0530 Subject: [PATCH] Fixed recursive call on setting date filter from route options --- frappe/public/js/frappe/views/reports/query_report.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js index ae9409cb04..b79e3571d2 100644 --- a/frappe/public/js/frappe/views/reports/query_report.js +++ b/frappe/public/js/frappe/views/reports/query_report.js @@ -275,6 +275,8 @@ frappe.views.QueryReport = Class.extend({ xhr.send(formData); }, setup_filters: function() { + if(this.setting_filters) return; + this.clear_filters(); var me = this; $.each(frappe.query_reports[this.report_name].filters || [], function(i, df) { @@ -310,8 +312,11 @@ frappe.views.QueryReport = Class.extend({ // hide page form if no filters var $filters = $(this.parent).find('.page-form .filters'); $(this.parent).find('.page-form').toggle($filters.length ? true : false); - + + this.setting_filters = true; this.set_route_filters() + this.setting_filters = false; + this.set_filters_by_name(); }, clear_filters: function() {