Merge branch 'hotfix'

frappe/__init__.py

@@ -14,7 +14,7 @@ import os, sys, importlib, inspect, json
 from .exceptions import *
 from .utils.jinja import get_jenv, get_template, render_template, get_email_from_template
 
-__version__ = '9.2.9'
+__version__ = '9.2.10'
 __title__ = "Frappe Framework"
 
 local = Local()

frappe/core/doctype/page/page.py

@@ -97,6 +97,7 @@ class Page(Document):
 	def load_assets(self):
 		from frappe.modules import get_module_path, scrub
 		import os
+		self.script = ''
 
 		page_name = scrub(self.name)
 

frappe/core/doctype/user/user.py

@@ -982,5 +982,6 @@ def reset_otp_secret(user):
 def throttle_user_creation():
 	if frappe.flags.in_import:
 		return
-	if frappe.db.get_creation_count('User', 60) > 60:
-		frappe.throw(_('Throttled'))
+
+	if frappe.db.get_creation_count('User', 60) > frappe.local.conf.get("throttle_user_limit", 60):
+		frappe.throw(_('Throttled'))

frappe/public/js/frappe/form/controls/dynamic_link.js

@@ -9,7 +9,11 @@ frappe.ui.form.ControlDynamicLink = frappe.ui.form.ControlLink.extend({
 		}
 		if (cur_frm==null && cur_list){
 			//for list page
-			return cur_list.wrapper.find("input[data-fieldname*="+this.df.options+"]").val();
+			let list_filter = cur_list.wrapper.find("input[data-fieldname*="+this.df.options+"]");
+			if(list_filter.length > 0) {
+				return list_filter.val();
+			}
+			return $(cur_page.page).find("input[data-fieldname*="+this.df.options+"]").val();
 		}
 		var options = frappe.model.get_value(this.df.parent, this.docname, this.df.options);
 		// if(!options) {