fix: set_query filter for

1. Custom_field 2. Customization dt
8848digital · Nov 6, 2024 · 1a3afcd · 1a3afcd
1 parent 5e5c76c
commit 1a3afcd
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/frappe/custom/doctype/custom_field/custom_field.js b/frappe/custom/doctype/custom_field/custom_field.js
@@ -10,9 +10,14 @@ frappe.ui.form.on("Custom Field", {
 			var filters = [
 				["DocType", "issingle", "=", 0],
 				["DocType", "custom", "=", 0],
-				["DocType", "name", "not in", frappe.model.core_doctypes_list],
-				["DocType", "restrict_to_domain", "in", frappe.boot.active_domains],
+				["DocType", "name", "not in", frappe.model.core_doctypes_list]
+
 			];
+
+			if (Array.isArray(frappe.boot.active_domains) && frappe.boot.active_domains.some(domain => domain)) {
+				filters.push(["DocType", "restrict_to_domain", "in", frappe.boot.active_domains]);
+			}
+
 			if (frappe.session.user !== "Administrator") {
 				filters.push(["DocType", "module", "not in", ["Core", "Custom"]]);
 			}

diff --git a/frappe/custom/doctype/customize_form/customize_form.js b/frappe/custom/doctype/customize_form/customize_form.js
@@ -15,13 +15,16 @@ frappe.ui.form.on("Customize Form", {
 
 	onload: function (frm) {
 		frm.set_query("doc_type", function () {
+			let filters = [
+				["DocType", "issingle", "=", 0],
+				["DocType", "custom", "=", 0],
+				["DocType", "name", "not in", frappe.model.core_doctypes_list]
+			]
+			if (Array.isArray(frappe.boot.active_domains) && frappe.boot.active_domains.some(domain => domain)) {
+				filters.push(["DocType", "restrict_to_domain", "in", frappe.boot.active_domains]);
+			}
 			return {
-				filters: [
-					["DocType", "issingle", "=", 0],
-					["DocType", "custom", "=", 0],
-					["DocType", "name", "not in", frappe.model.core_doctypes_list],
-					["DocType", "restrict_to_domain", "in", frappe.boot.active_domains],
-				],
+				filters: filters,
 			};
 		});