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

fix(prepared-report): Disable filters when showing a Prepared Report doc

Browse source
This commit is contained in:
Aditya Hase 2018-12-06 15:16:31 +05:30
parent fc48597694
commit 0467719466
2 changed files with 33 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
frappe/desk/query_report.py
View file

@ -167,6 +167,7 @@ def run(report_name, filters=None, user=None):
filters = json.loads(filters)
dn = filters.get("prepared_report_name")
filters.pop("prepared_report_name", None)
else:
dn = ""
result = get_prepared_report_result(report, filters, dn, user)

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

@ -268,7 +268,21 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
if (data.prepared_report){
this.prepared_report = true;
this.add_prepared_report_buttons(data.doc);
var query_string = frappe.utils.get_query_string(frappe.get_route_str())
var query_params = frappe.utils.get_query_params(query_string)
// If query_string contains prepared_report_name then set filters
// to match the mentioned prepared report doc and disable editing
if(query_params.prepared_report_name) {
this.render_prepared_report_doc = true
var filters_from_report = JSON.parse(data.doc.filters);
Object.values(this.filters).forEach(function(field) {
if (filters_from_report[field.fieldname]) {
field.set_input(filters_from_report[field.fieldname]);
}
field.input.disabled = true;
});
}
this.add_prepared_report_buttons(data.doc, );
}
this.toggle_message(false);
@ -304,12 +318,23 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
`));
};
// if
this.page.set_primary_action(
__("Generate New Report"),
this.generate_background_report.bind(this)
);
// if query_string has prepared_report_name then change primary action to create
// a new prepared report
if(this.render_prepared_report_doc) {
this.page.set_primary_action(
__("New"),
() => {
this.render_prepared_report_doc = false
frappe.set_route(frappe.get_route())
this.add_prepared_report_buttons()
}
);
} else {
this.page.set_primary_action(
__("Rebuild"),
this.generate_background_report.bind(this)
);
}
}
generate_background_report() {