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

Merge branch 'master' into develop

Browse source
This commit is contained in:
Nabin Hait 2016-08-23 16:31:51 +05:30
commit 4153bcf279
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/__init__.py
View file

@ -13,7 +13,7 @@ import os, sys, importlib, inspect, json
from .exceptions import *
from .utils.jinja import get_jenv, get_template, render_template
__version__ = "7.0.26"
__version__ = "7.0.27"
local = Local()

5
frappe/public/js/frappe/form/control.js
View file

@ -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) {

5
frappe/public/js/frappe/model/create_new.js
View file

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