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

[fix] frappe.query_report should be null if report is not initialized

Browse source
This commit is contained in:
Faris Ansari 2018-07-13 12:40:42 +05:30
parent 415a335531
commit ad1a46875e
1 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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;
}, {});
}
});