From f5952b69807e884b75f59a3c6225801717da6afc Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 23 Aug 2016 16:27:36 +0530 Subject: [PATCH] [fix] Remember last seleced value in Link field --- frappe/public/js/frappe/form/control.js | 5 +++-- frappe/public/js/frappe/model/create_new.js | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/frappe/public/js/frappe/form/control.js b/frappe/public/js/frappe/form/control.js index 1bd20aee61..7f29c23c4b 100644 --- a/frappe/public/js/frappe/form/control.js +++ b/frappe/public/js/frappe/form/control.js @@ -1319,8 +1319,9 @@ frappe.ui.form.ControlLink = frappe.ui.form.ControlData.extend({ // if remember_selected hook is set, add this value // to defaults so you do not need to set it again // unless it is changed. - if(frappe.boot.remember_selected && frappe.boot.remember_selected.indexOf(me.df.options)!==-1) { - frappe.boot.user.defaults[me.df.options] = ui.item.value; + if(frappe.boot.remember_selected + && frappe.boot.remember_selected.indexOf(me.df.options)!==-1) { + frappe.boot.user.last_selected_values[me.df.options] = ui.item.value; } if(me.frm && me.frm.doc) { diff --git a/frappe/public/js/frappe/model/create_new.js b/frappe/public/js/frappe/model/create_new.js index 071266a981..89cc6970b8 100644 --- a/frappe/public/js/frappe/model/create_new.js +++ b/frappe/public/js/frappe/model/create_new.js @@ -138,9 +138,10 @@ $.extend(frappe.model, { // 2 - look in user defaults var user_default = frappe.defaults.get_user_default(df.fieldname); - if(!user_default && df.fieldtype==='Link') { - user_default = frappe.defaults.get_user_default(df.options); + if(!user_default && df.fieldtype==='Link' && frappe.boot.user.last_selected_values) { + user_default = frappe.boot.user.last_selected_values[df.options]; } + var is_allowed_user_default = user_default && (!has_user_permissions || user_permissions[df.options].indexOf(user_default)!==-1);