From b305301f2422cb5ca04063f341f46e213c21cffa Mon Sep 17 00:00:00 2001 From: Himanshu Warekar Date: Wed, 30 Oct 2019 10:54:08 +0530 Subject: [PATCH 1/2] fix: convert int to string if title_Field --- frappe/public/js/frappe/form/toolbar.js | 3 ++- frappe/public/js/frappe/list/list_view.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/form/toolbar.js b/frappe/public/js/frappe/form/toolbar.js index 1fe60a2a4a..52f28e50b9 100644 --- a/frappe/public/js/frappe/form/toolbar.js +++ b/frappe/public/js/frappe/form/toolbar.js @@ -30,7 +30,8 @@ frappe.ui.form.Toolbar = Class.extend({ }, set_title: function() { if(this.frm.meta.title_field) { - var title = strip_html((this.frm.doc[this.frm.meta.title_field] || "").trim() || this.frm.docname); + let title_field = (this.frm.doc[this.frm.meta.title_field].toString() || "").trim(); + var title = strip_html(title_field || this.frm.docname); if(this.frm.doc.__islocal || title === this.frm.docname || this.frm.meta.autoname==="hash") { this.page.set_title_sub(""); } else { diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js index bb79b3441f..6912065e1c 100644 --- a/frappe/public/js/frappe/list/list_view.js +++ b/frappe/public/js/frappe/list/list_view.js @@ -719,7 +719,7 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList { let user = frappe.session.user; let subject_field = this.columns[0].df; let value = doc[subject_field.fieldname] || doc.name; - let subject = strip_html(value); + let subject = strip_html(value.toString()); let escaped_subject = frappe.utils.escape_html(subject); const liked_by = JSON.parse(doc._liked_by || '[]'); From 7b05814dc713cd483843d2710bf2de4c3a39629e Mon Sep 17 00:00:00 2001 From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> Date: Mon, 4 Nov 2019 12:20:33 +0530 Subject: [PATCH 2/2] fix: Handle null value --- frappe/public/js/frappe/form/toolbar.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/toolbar.js b/frappe/public/js/frappe/form/toolbar.js index 52f28e50b9..d551d6eeb9 100644 --- a/frappe/public/js/frappe/form/toolbar.js +++ b/frappe/public/js/frappe/form/toolbar.js @@ -30,7 +30,7 @@ frappe.ui.form.Toolbar = Class.extend({ }, set_title: function() { if(this.frm.meta.title_field) { - let title_field = (this.frm.doc[this.frm.meta.title_field].toString() || "").trim(); + let title_field = (this.frm.doc[this.frm.meta.title_field] || "").toString().trim(); var title = strip_html(title_field || this.frm.docname); if(this.frm.doc.__islocal || title === this.frm.docname || this.frm.meta.autoname==="hash") { this.page.set_title_sub("");