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

fix: Report filters in Custom Reports

Browse source 
- frappe.route_options should not override Report Filters
This commit is contained in:
Faris Ansari 2019-02-21 18:30:08 +05:30
parent e3be9b383f
commit de1ced231d
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
frappe/public/js/frappe/list/list_view.js
View file

@ -290,8 +290,10 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
if (frappe.route_options) {
this.filters = this.parse_filters_from_route_options();
return this.filter_area.clear(false)
.then(() => this.filter_area.set(this.filters));
if (this.filters.length > 0) {
return this.filter_area.clear(false)
.then(() => this.filter_area.set(this.filters));
}
}
return Promise.resolve();

8
frappe/public/js/frappe/views/reports/report_view.js
View file

@ -68,6 +68,14 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
});
}
before_refresh() {
if (this.report_doc) {
// don't parse frappe.route_options if this is a Custom Report
return Promise.resolve();
}
return super.before_refresh();
}
before_render() {
if (this.report_doc) {
this.set_dirty_state_for_custom_report();