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

fix: set filters when redirecting via show report button in prepared report

Browse source
This commit is contained in:
Ritwik Puri 2023-05-19 15:51:29 +05:30 • committed by GitHub
parent d0a24e66c5
commit a0fe38ecff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
frappe/core/doctype/prepared_report/prepared_report.js
View file

@ -2,7 +2,7 @@
// For license information, please see license.txt
frappe.ui.form.on("Prepared Report", {
render_filter_values: function (frm) {
render_filter_values: function (frm, filters) {
var wrapper = $(frm.fields_dict["filter_values"].wrapper).empty();
let filter_table = $(`<table class="table table-bordered">
@ -15,9 +15,6 @@ frappe.ui.form.on("Prepared Report", {
<tbody></tbody>
</table>`);
const filters = JSON.parse(frm.doc.filters);
frm.toggle_display(["filter_values"], !$.isEmptyObject(filters));
Object.keys(filters).forEach((key) => {
const filter_row = $(`<tr>
<td>${frappe.model.unscrub(key)}</td>
@ -31,7 +28,12 @@ frappe.ui.form.on("Prepared Report", {
refresh: function (frm) {
frm.disable_save();
frm.events.render_filter_values(frm);
const filters = JSON.parse(frm.doc.filters);
if (!$.isEmptyObject(filters)) {
frm.toggle_display(["filter_values"], 1);
frm.events.render_filter_values(frm, filters);
}
// always keep report_name hidden - we do this as we can't set mandatory and hidden
// property on a docfield at the same time
@ -39,13 +41,8 @@ frappe.ui.form.on("Prepared Report", {
if (frm.doc.status == "Completed") {
frm.page.set_primary_action(__("Show Report"), () => {
frappe.set_route(
"query-report",
frm.doc.report_name,
frappe.utils.make_query_string({
prepared_report_name: frm.doc.name,
})
);
frappe.route_options = filters;
frappe.set_route("query-report",frm.doc.report_name);
});
}
},

3
frappe/core/doctype/prepared_report/prepared_report.json
View file

@ -76,6 +76,7 @@
{
"fieldname": "filter_values",
"fieldtype": "HTML",
"hidden": 1,
"label": "Filter Values"
},
{
@ -103,7 +104,7 @@
],
"in_create": 1,
"links": [],
"modified": "2022-11-28 21:29:39.883803",
"modified": "2023-05-19 15:41:03.428589",
"modified_by": "Administrator",
"module": "Core",
"name": "Prepared Report",