浏览代码

Merge pull request #2004 from nabinhait/last_selected_values

[fix] Remember last seleced value in Link field
version-14
Nabin Hait 9 年前
committed by GitHub
父节点
当前提交
b8e12a8987
共有 2 个文件被更改,包括 6 次插入4 次删除
  1. +3
    -2
      frappe/public/js/frappe/form/control.js
  2. +3
    -2
      frappe/public/js/frappe/model/create_new.js

+ 3
- 2
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 // if remember_selected hook is set, add this value
// to defaults so you do not need to set it again // to defaults so you do not need to set it again
// unless it is changed. // 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) { if(me.frm && me.frm.doc) {


+ 3
- 2
frappe/public/js/frappe/model/create_new.js 查看文件

@@ -138,9 +138,10 @@ $.extend(frappe.model, {


// 2 - look in user defaults // 2 - look in user defaults
var user_default = frappe.defaults.get_user_default(df.fieldname); 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 && var is_allowed_user_default = user_default &&
(!has_user_permissions || user_permissions[df.options].indexOf(user_default)!==-1); (!has_user_permissions || user_permissions[df.options].indexOf(user_default)!==-1);




正在加载...
取消
保存