matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add from __future__ import unicode_literals, issue #37

Browse Source
This commit is contained in:
Roberto Rosario
2015-01-19 04:06:40 -04:00
parent efbac7300c
commit d59ea3ede2
334 changed files with 2452 additions and 2268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mayan/apps/dynamic_search/api.py
View File

@@ -1,6 +1,6 @@
# original code from:
# http://www.julienphalip.com/blog/2008/08/16/adding-search-django-site-snap/
from __future__ import absolute_import
from __future__ import unicode_literals
import datetime
import re
@@ -41,11 +41,11 @@ def get_query(terms, search_fields):
or_query = None
for field in search_fields:
if isinstance(field, types.StringTypes):
comparison = u'icontains'
comparison = 'icontains'
field_name = field
elif isinstance(field, types.DictType):
comparison = field.get('comparison', u'icontains')
field_name = field.get('field_name', u'')
comparison = field.get('comparison', 'icontains')
field_name = field.get('field_name', '')
if field_name:
q = Q(**{'%s__%s' % (field_name, comparison): term})
@@ -69,7 +69,7 @@ def perform_search(query_string, field_list=None):
search_dict = {}
if query_string:
simple_query_string = query_string.get('q', u'').strip()
simple_query_string = query_string.get('q', '').strip()
if simple_query_string:
for model, values in registered_search_dict.items():
search_dict.setdefault(values['model'], {'query_entries': [], 'title': values['title']})