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

Merge pull request #7425 from rohitwaghchaure/plus_button_redirect_issue

Browse source 
fix: create new from dashboard will not set the value in the dynamic link field
This commit is contained in:
rohitwaghchaure 2019-05-07 13:27:54 +05:30 • committed by GitHub
commit 7f346bf439
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/public/js/frappe/model/model.js
View file

@ -382,7 +382,7 @@ $.extend(frappe.model, {
tasks.push(() => frappe.model.trigger(key, value, doc));
} else {
// execute link triggers (want to reselect to execute triggers)
if(fieldtype=="Link" && doc) {
if(in_list(["Link", "Dynamic Link"], fieldtype) && doc) {
tasks.push(() => frappe.model.trigger(key, value, doc));
}
}

7
frappe/public/js/legacy/client_script_helpers.js
View file

@ -509,7 +509,12 @@ _f.Frm.prototype.make_new = function(doctype) {
// set link fields (if found)
frappe.get_meta(doctype).fields.forEach(function(df) {
if(df.fieldtype==='Link' && df.options===me.doctype) {
if(df.fieldtype==='Link' && df.options==="DocType") {
new_doc[df.fieldname] = me.doctype;
}
if((df.fieldtype==='Link' && df.options===me.doctype)
|| (df.fieldtype==='Dynamic Link' && new_doc[df.options] === me.doctype)) {
new_doc[df.fieldname] = me.doc.name;
}
});

2
frappe/public/js/legacy/form.js
View file

@ -615,7 +615,7 @@ _f.Frm.prototype.trigger_link_fields = function() {
// trigger link fields which have default values set
if (this.is_new() && this.doc.__run_link_triggers) {
$.each(this.fields_dict, function(fieldname, field) {
if (field.df.fieldtype=="Link" && this.doc[fieldname]) {
if (in_list(['Link', 'Dynamic Link'], field.df.fieldtype) && this.doc[fieldname]) {
// triggers add fetch, sets value in model and runs triggers
field.set_value(this.doc[fieldname]);
}