From ef54a4ec5d6daa2d186290d91d9fa3d788eceda6 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Tue, 7 Jan 2020 12:32:40 +0530
Subject: [PATCH] fix: frappe.confirm fixes

---
 frappe/public/js/frappe/form/toolbar.js | 8 ++++++--
 frappe/public/js/frappe/model/model.js  | 4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/frappe/public/js/frappe/form/toolbar.js b/frappe/public/js/frappe/form/toolbar.js
index a84432d792..f6bc6f7cc8 100644
--- a/frappe/public/js/frappe/form/toolbar.js
+++ b/frappe/public/js/frappe/form/toolbar.js
@@ -80,10 +80,12 @@ frappe.ui.form.Toolbar = Class.extend({
 		const title_field = this.frm.meta.title_field || '';
 		const doctype = this.frm.doctype;
 
+		let confirm_message=null;
+
 		if (new_name) {
 			const warning = __("This cannot be undone");
 			const message = __("Are you sure you want to merge {0} with {1}?", [docname.bold(), new_name.bold()]);
-			const confirm_message = message + "<br><b>" + warning + "<b>";
+			confirm_message = `${message}<br><b>${warning}<b>`;
 		}
 
 		let rename_document = () => {
@@ -109,7 +111,9 @@ frappe.ui.form.Toolbar = Class.extend({
 				this.show_unchanged_document_alert();
 				resolve();
 			} else if (merge) {
-				frappe.confirm(confirm_message, function() { rename_document().then(resolve).catch(reject) }, reject);
+				frappe.confirm(confirm_message, () => {
+					rename_document().then(resolve).catch(reject);
+				}, reject);
 			} else {
 				rename_document().then(resolve).catch(reject);
 			}
diff --git a/frappe/public/js/frappe/model/model.js b/frappe/public/js/frappe/model/model.js
index 37e087905b..ec44be5830 100644
--- a/frappe/public/js/frappe/model/model.js
+++ b/frappe/public/js/frappe/model/model.js
@@ -557,8 +557,8 @@ $.extend(frappe.model, {
 		var d = new frappe.ui.Dialog({
 			title: __("Rename {0}", [__(docname)]),
 			fields: [
-				{label:__("New Name"), fieldname: "new_name", fieldtype:"Data", reqd:1, "default": docname},
-				{label:merge_label, fieldtype:"Check", fieldname:"merge"},
+				{label: __("New Name"), fieldname: "new_name", fieldtype: "Data", reqd: 1, "default": docname},
+				{label: merge_label, fieldtype: "Check", fieldname: "merge"},
 			]
 		});