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

[search] convert filters from dict to list before using reportview's query system

Browse source
This commit is contained in:
Anand Doshi 2013-05-30 11:53:13 +05:30
parent 0faa76aefa
commit 93a7385ccc
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
webnotes/widgets/search.py
View file

@ -41,10 +41,6 @@ def search_widget(doctype, txt, query=None, searchfield="name", start=0,
if isinstance(filters, basestring):
import json
filters = json.loads(filters)
if isinstance(filters, dict):
filters = map(lambda f: [doctype, f[0], "=", f[1]], filters.items())
if filters==None:
filters = []
meta = webnotes.get_doctype(doctype)
@ -62,6 +58,11 @@ def search_widget(doctype, txt, query=None, searchfield="name", start=0,
webnotes.response["values"] = webnotes.conn.sql(scrub_custom_query(query,
searchfield, txt))
else:
if isinstance(filters, dict):
filters = map(lambda f: [doctype, f[0], "=", f[1]], filters.items())
if filters==None:
filters = []
# build from doctype
if txt:
filters.append([doctype, searchfield, "like", txt + "%"])