vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

fix: Added dynamic links in dashboard (#7475)

Browse source
This commit is contained in:
Deepesh Garg 2019-05-14 15:06:43 +05:30 • committed by Faris Ansari
parent b2f897746a
commit 65b04ea494
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
frappe/public/js/frappe/form/dashboard.js
View file

@ -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;
},

3
frappe/public/js/frappe/list/base_list.js
View file

@ -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'
};
}));