Merge branch 'version-15' of https://github.com/zaviagodev/frappe int…

…o version-15-unstable
zaviagodev · Nov 20, 2024 · 8225dd5 · 8225dd5
2 parents ba0eed6 + f58a0d7
commit 8225dd5
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/frappe/public/js/frappe/form/controls/link.js b/frappe/public/js/frappe/form/controls/link.js
@@ -309,6 +309,10 @@ frappe.ui.form.ControlLink = class ControlLink extends frappe.ui.form.ControlDat
 								r.message = r.message.concat(custom__link_options);
 							}
 
+							if(frappe?.custom_options &&(frappe?.custom_options[me.df.fieldname] ?? []).length) {
+								r.message = r.message.concat(frappe.custom_options[me.df.fieldname]);
+							}
+
 							// advanced search
 							if (locals && locals["DocType"]) {
 								// not applicable in web forms