Browse Source

[hot][fix] set field type

version-14
Saurabh 8 years ago
parent
commit
17e9315f3c
1 changed files with 2 additions and 2 deletions
  1. +2
    -2
      frappe/public/js/frappe/ui/filters/filters.js

+ 2
- 2
frappe/public/js/frappe/ui/filters/filters.js View File

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


Loading…
Cancel
Save