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

fix: filters on prepared report export

Browse source
This commit is contained in:
Rutwik Hiwalkar 2024-04-22 22:13:53 +05:30
parent d11f8e7bcb
commit 71a9fa4fe9
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1522,12 +1522,6 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
this.make_access_log("Export", file_format);
let filters = this.get_filter_values(true);
if (frappe.urllib.get_dict("prepared_report_name")) {
filters = Object.assign(
frappe.urllib.get_dict("prepared_report_name"),
filters
);
}
let boolean_labels = { 1: __("Yes"), 0: __("No") };
let applied_filters = Object.fromEntries(
Object.entries(filters).map(([key, value]) => [
@ -1537,6 +1531,13 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
: value,
])
);
let query_params = this.get_query_params();
if ("prepared_report_name" in query_params) {
filters = Object.assign(
{ prepared_report_name: query_params["prepared_report_name"] },
filters
);
}
const visible_idx = this.datatable?.bodyRenderer.visibleRowIndices || [];
if (visible_idx.length + 1 === this.data?.length) {