From a1ae7fcbc8af9934d31acee1daa8564bcbc6edf6 Mon Sep 17 00:00:00 2001 From: Devin Slauenwhite Date: Thu, 24 Feb 2022 16:36:30 -0500 Subject: [PATCH 1/2] fix: show fail message --- erpnext/utilities/doctype/rename_tool/rename_tool.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/erpnext/utilities/doctype/rename_tool/rename_tool.js b/erpnext/utilities/doctype/rename_tool/rename_tool.js index 5553e44ef8..5a2d249b42 100644 --- a/erpnext/utilities/doctype/rename_tool/rename_tool.js +++ b/erpnext/utilities/doctype/rename_tool/rename_tool.js @@ -30,7 +30,14 @@ frappe.ui.form.on("Rename Tool", { select_doctype: frm.doc.select_doctype }, callback: function(r) { - frm.get_field("rename_log").$wrapper.html(r.message.join("
")); + let html = r.message.join("
"); + + if (r.exc) { + r.exc = JSON.parse(r.exc); + html += "
" + r.exc.join("
"); + } + + frm.get_field("rename_log").$wrapper.html(html); } }); }); From 597bb2c7e827f16f6b63c6c0cd4e702b2b8509d2 Mon Sep 17 00:00:00 2001 From: Saqib Ansari Date: Wed, 16 Mar 2022 10:53:39 +0530 Subject: [PATCH 2/2] feat: safely parse exception --- erpnext/utilities/doctype/rename_tool/rename_tool.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/erpnext/utilities/doctype/rename_tool/rename_tool.js b/erpnext/utilities/doctype/rename_tool/rename_tool.js index 5a2d249b42..b8203f4226 100644 --- a/erpnext/utilities/doctype/rename_tool/rename_tool.js +++ b/erpnext/utilities/doctype/rename_tool/rename_tool.js @@ -33,8 +33,10 @@ frappe.ui.form.on("Rename Tool", { let html = r.message.join("
"); if (r.exc) { - r.exc = JSON.parse(r.exc); - html += "
" + r.exc.join("
"); + r.exc = frappe.utils.parse_json(r.exc); + if (Array.isArray(r.exc)) { + html += "
" + r.exc.join("
"); + } } frm.get_field("rename_log").$wrapper.html(html);