From f9b3a6c24216c20f789eb4a99f65266c0715925e Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Mon, 11 Mar 2019 05:29:50 +0000 Subject: [PATCH 1/5] fix: Minor changes for smooth migration to v12 --- frappe/model/document.py | 3 ++- frappe/patches.txt | 1 + frappe/patches/v11_0/delete_duplicate_user_permissions.py | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/frappe/model/document.py b/frappe/model/document.py index e7c4d156e2..4542cb03cb 100644 --- a/frappe/model/document.py +++ b/frappe/model/document.py @@ -1015,7 +1015,8 @@ class Document(BaseDocument): version = frappe.new_doc('Version') if version.set_diff(self._doc_before_save, self): version.insert(ignore_permissions=True) - follow_document(self.doctype, self.name, frappe.session.user) + if not frappe.flags.in_migrate: + follow_document(self.doctype, self.name, frappe.session.user) @staticmethod def whitelist(f): diff --git a/frappe/patches.txt b/frappe/patches.txt index 496702259c..487aabc21f 100644 --- a/frappe/patches.txt +++ b/frappe/patches.txt @@ -200,6 +200,7 @@ frappe.patches.v9_1.move_feed_to_activity_log execute:frappe.delete_doc('Page', 'data-import-tool', ignore_missing=True) frappe.patches.v10_0.reload_countries_and_currencies frappe.patches.v10_0.refactor_social_login_keys +execute:frappe.reload_doc('email', 'doctype', 'document_follow') frappe.patches.v10_0.enable_chat_by_default_within_system_settings frappe.patches.v10_0.remove_custom_field_for_disabled_domain execute:frappe.delete_doc("Page", "chat") diff --git a/frappe/patches/v11_0/delete_duplicate_user_permissions.py b/frappe/patches/v11_0/delete_duplicate_user_permissions.py index 9795d2dead..9d9d516ac5 100644 --- a/frappe/patches/v11_0/delete_duplicate_user_permissions.py +++ b/frappe/patches/v11_0/delete_duplicate_user_permissions.py @@ -9,5 +9,5 @@ def execute(): for record in duplicateRecords: frappe.db.sql("""delete from `tabUser Permission` - where allow='{0}' and user='{1}' and for_value='{2}' limit {3}""" - .format(record.allow, record.user, frappe.db.escape(record.for_value), record.count - 1)) + where allow=%s and user=%s and for_value=%s limit {0}""" + .format(record.count - 1), (record.allow, record.user, record.for_value)) From 2c2ca66cfd5323abe0626a85875ec46df125c6b7 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Mon, 11 Mar 2019 05:30:24 +0000 Subject: [PATCH 2/5] fix: Always commit error logs --- frappe/__init__.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index ea8242196c..1a92df18b6 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -1478,8 +1478,10 @@ def logger(module=None, with_more_info=True): def log_error(message=None, title=None): '''Log error to Error Log''' - return get_doc(dict(doctype='Error Log', error=as_unicode(message or get_traceback()), + doc = get_doc(dict(doctype='Error Log', error=as_unicode(message or get_traceback()), method=title)).insert(ignore_permissions=True) + db.commit() + return doc def get_desk_link(doctype, name): return '{2} {1}'.format(doctype, name, _(doctype)) From 015937f334589136771ec54b341babcdf7b83b65 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Mon, 11 Mar 2019 05:31:23 +0000 Subject: [PATCH 3/5] fix: Error log link when error in notification --- frappe/email/doctype/notification/notification.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/frappe/email/doctype/notification/notification.py b/frappe/email/doctype/notification/notification.py index ba211bdf23..79000b447d 100644 --- a/frappe/email/doctype/notification/notification.py +++ b/frappe/email/doctype/notification/notification.py @@ -316,8 +316,9 @@ def evaluate_alert(doc, alert, event): except TemplateError: frappe.throw(_("Error while evaluating Notification {0}. Please fix your template.").format(alert)) except Exception as e: - frappe.log_error(message=frappe.get_traceback(), title=str(e)) - frappe.throw(_("Error in Notification")) + error_log = frappe.log_error(message=frappe.get_traceback(), title=str(e)) + frappe.throw(_("Error in Notification: {}".format( + frappe.utils.get_link_to_form('Error Log', error_log.name)))) def get_context(doc): return {"doc": doc, "nowdate": nowdate, "frappe.utils": frappe.utils} From 5ac4a34f2462ee671cc6581edbf15e88183903f8 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Mon, 11 Mar 2019 05:32:03 +0000 Subject: [PATCH 4/5] fix: Update modified to pick up field change - Default Print Language is not picked up in some migrations --- frappe/printing/doctype/print_format/print_format.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/printing/doctype/print_format/print_format.json b/frappe/printing/doctype/print_format/print_format.json index 6cb6b877b1..f8c8f97105 100644 --- a/frappe/printing/doctype/print_format/print_format.json +++ b/frappe/printing/doctype/print_format/print_format.json @@ -729,7 +729,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2017-09-05 14:01:05.658719", + "modified": "2017-09-05 14:02:05.658719", "modified_by": "Administrator", "module": "Printing", "name": "Print Format", From 9f9a579b0a6ed71fd1285028b32bd57bcb60d1af Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Mon, 11 Mar 2019 12:00:54 +0530 Subject: [PATCH 5/5] fix: Revert auto-commit --- frappe/__init__.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index 1a92df18b6..ea8242196c 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -1478,10 +1478,8 @@ def logger(module=None, with_more_info=True): def log_error(message=None, title=None): '''Log error to Error Log''' - doc = get_doc(dict(doctype='Error Log', error=as_unicode(message or get_traceback()), + return get_doc(dict(doctype='Error Log', error=as_unicode(message or get_traceback()), method=title)).insert(ignore_permissions=True) - db.commit() - return doc def get_desk_link(doctype, name): return '{2} {1}'.format(doctype, name, _(doctype))