From ba9818a61eafc7dfada0ff0b85d3b35dd71b47fd Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Thu, 18 Jan 2018 14:50:54 +0530 Subject: [PATCH] Listview fixes (#4846) * [minor] Handle empty fieldselect map * Handle 0 rows in reportview --- frappe/public/js/frappe/ui/filters/filter.js | 2 +- frappe/public/js/frappe/views/reports/report_view.js | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/ui/filters/filter.js b/frappe/public/js/frappe/ui/filters/filter.js index 35ad71c91f..77fef195eb 100644 --- a/frappe/public/js/frappe/ui/filters/filter.js +++ b/frappe/public/js/frappe/ui/filters/filter.js @@ -115,7 +115,7 @@ frappe.ui.Filter = class { let cur = {}; if(this.field) for(let k in this.field.df) cur[k] = this.field.df[k]; - let original_docfield = this.fieldselect.fields_by_name[doctype][fieldname]; + let original_docfield = (this.fieldselect.fields_by_name[doctype] || {})[fieldname]; if(!original_docfield) { frappe.msgprint(__("Field {0} is not selectable.", [fieldname])); return; diff --git a/frappe/public/js/frappe/views/reports/report_view.js b/frappe/public/js/frappe/views/reports/report_view.js index 7f0aa2c2d9..8f658cb4a3 100644 --- a/frappe/public/js/frappe/views/reports/report_view.js +++ b/frappe/public/js/frappe/views/reports/report_view.js @@ -63,6 +63,8 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView { } render() { + if (this.data.length === 0) return; + if (this.datatable) { this.datatable.refresh(this.get_data(this.data)); return;