From 8a4d85a5ade879f4d6d5de8cfa4177e494d250ee Mon Sep 17 00:00:00 2001 From: Gursheen Anand Date: Thu, 30 Nov 2023 15:07:30 +0530 Subject: [PATCH] fix: parse applied filter json before building data --- frappe/desk/query_report.py | 5 +++-- frappe/desk/reportview.py | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/frappe/desk/query_report.py b/frappe/desk/query_report.py index 0a25dd3b8f..cb5294b5ef 100644 --- a/frappe/desk/query_report.py +++ b/frappe/desk/query_report.py @@ -328,7 +328,8 @@ def export_query(): report_name, form_params.filters, custom_columns=custom_columns, are_default_filters=False ) data = frappe._dict(data) - data.filters = form_params.filters + data.filters = form_params.applied_filters + if not data.columns: frappe.respond_as_web_page( _("No data to export"), @@ -396,7 +397,7 @@ def build_xlsx_data( if filter_value in ["", None, []]: continue filter_value = ", ".join(filter_value) if isinstance(filter_value, list) else cstr(filter_value) - filter_data.append([cstr(filter_name) + ": ", filter_value]) + filter_data.append([cstr(filter_name), filter_value]) filter_data.append([]) result += filter_data diff --git a/frappe/desk/reportview.py b/frappe/desk/reportview.py index 8f2f7f8dca..5874fd37ac 100644 --- a/frappe/desk/reportview.py +++ b/frappe/desk/reportview.py @@ -217,6 +217,8 @@ def clean_params(data): def parse_json(data): if (filters := data.get("filters")) and isinstance(filters, str): data["filters"] = json.loads(filters) + if (applied_filters := data.get("applied_filters")) and isinstance(applied_filters, str): + data["applied_filters"] = json.loads(applied_filters) if (or_filters := data.get("or_filters")) and isinstance(or_filters, str): data["or_filters"] = json.loads(or_filters) if (fields := data.get("fields")) and isinstance(fields, str):