Merge pull request #14308 from frappe/v12-pre-release

chore: Merge v12-pre-release into version-12
frappe · Sep 28, 2021 · 08e7d7e · 08e7d7e
2 parents 4b240b9 + 12b6ac3
commit 08e7d7e
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 22 deletions.
diff --git a/frappe/__init__.py b/frappe/__init__.py
@@ -23,7 +23,7 @@
 	reload(sys)
 	sys.setdefaultencoding("utf-8")
 
-__version__ = '12.22.0'
+__version__ = 'Release 12.22.1'
 __title__ = "Frappe Framework"
 
 local = Local()

diff --git a/frappe/patches/v11_0/create_contact_for_user.py b/frappe/patches/v11_0/create_contact_for_user.py
@@ -8,7 +8,6 @@ def execute():
 	frappe.reload_doc('integrations', 'doctype', 'google_contacts')
 	frappe.reload_doc('contacts', 'doctype', 'contact')
 	frappe.reload_doc('core', 'doctype', 'dynamic_link')
-	frappe.reload_doc('communication', 'doctype', 'call_log')
 
 	contact_meta = frappe.get_meta("Contact")
 	if contact_meta.has_field("phone_nos") and contact_meta.has_field("email_ids"):

diff --git a/frappe/patches/v11_0/rename_google_maps_doctype.py b/frappe/patches/v11_0/rename_google_maps_doctype.py
@@ -5,4 +5,3 @@
 def execute():
 	if frappe.db.exists("DocType","Google Maps") and not frappe.db.exists("DocType","Google Maps Settings"):
 		rename_doc('DocType', 'Google Maps', 'Google Maps Settings')
-		frappe.reload_doc('integrations', 'doctype', 'google_maps_settings')
diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js
@@ -199,8 +199,7 @@ frappe.ui.form.Form = class FrappeForm {
 
 				me.layout.refresh_dependency();
 				me.layout.refresh_sections();
-				let object = me.script_manager.trigger(fieldname, doc.doctype, doc.name);
-				return object;
+				return me.script_manager.trigger(fieldname, doc.doctype, doc.name);
 			}
 		});
 
@@ -215,7 +214,7 @@ frappe.ui.form.Form = class FrappeForm {
 				if(doc.parent===me.docname && doc.parentfield===df.fieldname) {
 					me.dirty();
 					me.fields_dict[df.fieldname].grid.set_value(fieldname, value, doc);
-					me.script_manager.trigger(fieldname, doc.doctype, doc.name);
+					return me.script_manager.trigger(fieldname, doc.doctype, doc.name);
 				}
 			});
 		});

diff --git a/frappe/public/js/frappe/model/model.js b/frappe/public/js/frappe/model/model.js
@@ -416,31 +416,31 @@ $.extend(frappe.model, {
 	},
 
 	trigger: function(fieldname, value, doc) {
-		let tasks = [];
-		var runner = function(events, event_doc) {
-			$.each(events || [], function(i, fn) {
-				if(fn) {
-					let _promise = fn(fieldname, value, event_doc || doc);
+		const tasks = [];
+
+		function enqueue_events(events) {
+			if (!events) return;
+
+			for (const fn of events) {
+				if (!fn) continue;
+
+				tasks.push(() => {
+					const return_value = fn(fieldname, value, doc);
 
 					// if the trigger returns a promise, return it,
 					// or use the default promise frappe.after_ajax
-					if (_promise && _promise.then) {
-						return _promise;
+					if (return_value && return_value.then) {
+						return return_value;
 					} else {
 						return frappe.after_server_call();
 					}
-				}
-			});
+				});
+			}
 		};
 
 		if(frappe.model.events[doc.doctype]) {
-			tasks.push(() => {
-				return runner(frappe.model.events[doc.doctype][fieldname]);
-			});
-
-			tasks.push(() => {
-				return runner(frappe.model.events[doc.doctype]['*']);
-			});
+			enqueue_events(frappe.model.events[doc.doctype][fieldname]);
+			enqueue_events(frappe.model.events[doc.doctype]['*']);
 		}
 
 		return frappe.run_serially(tasks);