From cef1e08df4382fb656c91952df65b89573ef8002 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Fri, 5 Jun 2020 13:43:07 +0530 Subject: [PATCH] test: fix report view * override render_header in report view * cleaner refresh in list view.js --- frappe/public/js/frappe/list/list_view.js | 14 +------------- .../public/js/frappe/views/reports/report_view.js | 4 ++++ 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js index c282d43d9b..f2cba7c038 100644 --- a/frappe/public/js/frappe/list/list_view.js +++ b/frappe/public/js/frappe/list/list_view.js @@ -241,20 +241,8 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList { } refresh(refresh_header=false) { - this.freeze(true); - // fetch data from server - return frappe.call(this.get_call_args()).then(r => { - // render - this.prepare_data(r); - this.toggle_result_area(); - this.before_render(); + super.refresh().then(() => { this.render_header(refresh_header); - this.render(); - this.after_render(); - this.freeze(false); - if (this.settings.refresh) { - this.settings.refresh(this); - } }); } diff --git a/frappe/public/js/frappe/views/reports/report_view.js b/frappe/public/js/frappe/views/reports/report_view.js index 17e61c4f89..bc4129935e 100644 --- a/frappe/public/js/frappe/views/reports/report_view.js +++ b/frappe/public/js/frappe/views/reports/report_view.js @@ -10,6 +10,10 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView { return 'Report'; } + render_header() { + // Override List View Header + } + setup_defaults() { super.setup_defaults(); this.page_title = __('Report:') + ' ' + this.page_title;