From bb91907fd05bc8b4fc105f9f27c4891f69ebbbd6 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Fri, 20 May 2022 11:02:28 +0530 Subject: [PATCH] fix(form): Use actual doctype of link intead of parent doctype Due to this wrong doctype, Link Preview popover was not working as expected. --- frappe/public/js/frappe/form/form.js | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js index 2572f7b2e3..d29761cd21 100644 --- a/frappe/public/js/frappe/form/form.js +++ b/frappe/public/js/frappe/form/form.js @@ -1628,11 +1628,11 @@ frappe.ui.form.Form = class FrappeForm { set_indicator_formatter(fieldname, get_color, get_text) { // get doctype from parent var doctype; - if(frappe.meta.docfield_map[this.doctype][fieldname]) { + if (frappe.meta.docfield_map[this.doctype][fieldname]) { doctype = this.doctype; } else { frappe.meta.get_table_fields(this.doctype).every(function(df) { - if(frappe.meta.docfield_map[df.options][fieldname]) { + if (frappe.meta.docfield_map[df.options][fieldname]) { doctype = df.options; return false; } else { @@ -1643,11 +1643,11 @@ frappe.ui.form.Form = class FrappeForm { frappe.meta.docfield_map[doctype][fieldname].formatter = function(value, df, options, doc) { - if(value) { + if (value) { var label; - if(get_text) { + if (get_text) { label = get_text(doc); - } else if(frappe.form.link_formatters[df.options]) { + } else if (frappe.form.link_formatters[df.options]) { label = frappe.form.link_formatters[df.options](value, doc); } else { label = value; @@ -1655,7 +1655,14 @@ frappe.ui.form.Form = class FrappeForm { const escaped_name = encodeURIComponent(value); - return `${label}`; + return ` + + ${label} + + `; } else { return ''; }