From 17e9315f3c988a72264a9746fd098ebda90de418 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Fri, 30 Jun 2017 11:52:39 +0530 Subject: [PATCH] [hot][fix] set field type --- frappe/public/js/frappe/ui/filters/filters.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/ui/filters/filters.js b/frappe/public/js/frappe/ui/filters/filters.js index dac1222dda..4269bbff81 100644 --- a/frappe/public/js/frappe/ui/filters/filters.js +++ b/frappe/public/js/frappe/ui/filters/filters.js @@ -216,7 +216,7 @@ frappe.ui.Filter = Class.extend({ : __("use % as wildcard"))+''); } 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") {