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

Merge pull request #2819 from nabinhait/report_date_filter

Browse source 
Fixed recursive call on setting date filter from route options
This commit is contained in:
Nabin Hait 2017-03-07 19:44:07 +05:30 • committed by GitHub
commit 960c27eef1
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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() {