From 7dc5c358da91ea8e53328adbac55c3afe8e1d681 Mon Sep 17 00:00:00 2001 From: Devin Slauenwhite Date: Thu, 24 Feb 2022 16:50:10 -0500 Subject: [PATCH 1/2] fix: log failed rename record. --- frappe/model/rename_doc.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/frappe/model/rename_doc.py b/frappe/model/rename_doc.py index 787f276b17..6b1ae3d374 100644 --- a/frappe/model/rename_doc.py +++ b/frappe/model/rename_doc.py @@ -77,13 +77,15 @@ def rename_doc( ) -> str: """Rename a doc(dt, old) to doc(dt, new) and update all linked fields of type "Link".""" if not frappe.db.exists(doctype, old): + frappe.errprint(_("Failed: {0} to {1} because {0} doesn't exist.").format(old, new)) return if ignore_if_exists and frappe.db.exists(doctype, new): + frappe.errprint(_("Failed: {0} to {1} because {1} already exists.").format(old, new)) return if old==new: - frappe.msgprint(_('Please select a new name to rename')) + frappe.errprint(_("Failed: {0} to {1} no changes made.").format(old, new)) return force = cint(force) @@ -540,15 +542,16 @@ def bulk_rename(doctype: str, rows: Optional[List[List]] = None, via_console: bo msg = _("Successful: {0} to {1}").format(row[0], row[1]) frappe.db.commit() else: - msg = _("Ignored: {0} to {1}").format(row[0], row[1]) + msg = None except Exception as e: msg = _("** Failed: {0} to {1}: {2}").format(row[0], row[1], repr(e)) frappe.db.rollback() - if via_console: - print(msg) - else: - rename_log.append(msg) + if msg: + if via_console: + print(msg) + else: + rename_log.append(msg) frappe.enqueue('frappe.utils.global_search.rebuild_for_doctype', doctype=doctype) From 501a1675ec7eee1933c507c7cc0b084086ac9015 Mon Sep 17 00:00:00 2001 From: gavin Date: Tue, 1 Mar 2022 22:31:17 +0530 Subject: [PATCH 2/2] chore(rename_doc): Consistent error message for no change --- frappe/model/rename_doc.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/model/rename_doc.py b/frappe/model/rename_doc.py index 6b1ae3d374..faa3859c91 100644 --- a/frappe/model/rename_doc.py +++ b/frappe/model/rename_doc.py @@ -85,7 +85,7 @@ def rename_doc( return if old==new: - frappe.errprint(_("Failed: {0} to {1} no changes made.").format(old, new)) + frappe.errprint(_("Ignored: {0} to {1} no changes made because old and new name are the same.").format(old, new)) return force = cint(force)