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

Merge branch 'hotfix'

Browse source
This commit is contained in:
mbauskar 2017-06-30 11:58:13 +05:30
commit b72dded0f7
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/__init__.py
View file

@ -14,7 +14,7 @@ import os, sys, importlib, inspect, json
from .exceptions import *
from .utils.jinja import get_jenv, get_template, render_template
__version__ = '8.2.2'
__version__ = '8.2.3'
__title__ = "Frappe Framework"
local = Local()

4
frappe/public/js/frappe/ui/filters/filters.js
View file

@ -216,7 +216,7 @@ frappe.ui.Filter = Class.extend({
: __("use % as wildcard"))+'</div>');
} else {
//if condition selected after refresh
me.set_field(me.field.df.parent, me.field.df.fieldname, me.field.df.fieldtype, condition);
me.set_field(me.field.df.parent, me.field.df.fieldname, null, condition);
}
});
@ -345,7 +345,7 @@ frappe.ui.Filter = Class.extend({
} else if(['Text','Small Text','Text Editor','Code','Tag','Comments',
'Dynamic Link','Read Only','Assign'].indexOf(df.fieldtype)!=-1) {
df.fieldtype = 'Data';
} else if(df.fieldtype=='Link' && this.wrapper.find('.condition').val()!="=") {
} else if(df.fieldtype=='Link' && ['=', '!='].indexOf(this.wrapper.find('.condition').val())==-1) {
df.fieldtype = 'Data';
}
if(df.fieldtype==="Data" && (df.options || "").toLowerCase()==="email") {