diff --git a/frappe/public/js/frappe/form/dashboard.js b/frappe/public/js/frappe/form/dashboard.js index 8b15715361..0ef25dfae3 100644 --- a/frappe/public/js/frappe/form/dashboard.js +++ b/frappe/public/js/frappe/form/dashboard.js @@ -310,6 +310,12 @@ frappe.ui.form.Dashboard = Class.extend({ var fieldname = this.data.non_standard_fieldnames ? (this.data.non_standard_fieldnames[doctype] || this.data.fieldname) : this.data.fieldname; + + if (this.data.dynamic_links && this.data.dynamic_links[fieldname]) { + let dynamic_fieldname = this.data.dynamic_links[fieldname][1]; + filter[dynamic_fieldname] = this.data.dynamic_links[fieldname][0]; + } + filter[fieldname] = this.frm.doc.name; return filter; }, diff --git a/frappe/public/js/frappe/list/base_list.js b/frappe/public/js/frappe/list/base_list.js index d702020c52..48f60a0829 100644 --- a/frappe/public/js/frappe/list/base_list.js +++ b/frappe/public/js/frappe/list/base_list.js @@ -619,7 +619,8 @@ class FilterArea { options: options, fieldname: df.fieldname, condition: condition, - onchange: () => this.refresh_list_view() + onchange: () => this.refresh_list_view(), + ignore_link_validation: fieldtype === 'Dynamic Link' }; }));