summaryrefslogtreecommitdiff
path: root/ishtar_common/views_item.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2018-08-20 12:40:32 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2018-08-20 12:40:47 +0200
commit193fbc5831e470f0eb169affa233c999f9d5f192 (patch)
tree8d425ccc0487ed3bb467b25069de4e82331a1060 /ishtar_common/views_item.py
parenta3638cae1662df94ee85897e736dcf834ea661ec (diff)
downloadIshtar-193fbc5831e470f0eb169affa233c999f9d5f192.tar.bz2
Ishtar-193fbc5831e470f0eb169affa233c999f9d5f192.zip
Search: explicit search vector reference
Diffstat (limited to 'ishtar_common/views_item.py')
-rw-r--r--ishtar_common/views_item.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/ishtar_common/views_item.py b/ishtar_common/views_item.py
index 33f3f2092..1b6d1e724 100644
--- a/ishtar_common/views_item.py
+++ b/ishtar_common/views_item.py
@@ -429,7 +429,7 @@ def _parse_parentheses_groups(groups, request_keys, current_dct=None,
return unidecode(query), current_dct, exc_dct
-def _search_manage_search_vector(dct, exc_dct, request_keys):
+def _search_manage_search_vector(model, dct, exc_dct, request_keys):
if 'search_vector' not in dct:
return dct, exc_dct
@@ -440,7 +440,8 @@ def _search_manage_search_vector(dct, exc_dct, request_keys):
exc_dct.update(extra_exc_dct)
if search_query:
dct['extras'].append(
- {'where': ["search_vector @@ (to_tsquery(%s, %s)) = true"],
+ {'where': [model._meta.db_table +
+ ".search_vector @@ (to_tsquery(%s, %s)) = true"],
'params': [settings.ISHTAR_SEARCH_LANGUAGE,
search_query]}
)
@@ -973,8 +974,8 @@ def get_item(model, func_name, default_name, extra_request_keys=[],
request.session[func_name] = dct
dct['extras'] = []
- dct, excluded_dct = _search_manage_search_vector(dct, excluded_dct,
- request_keys)
+ dct, excluded_dct = _search_manage_search_vector(
+ model, dct, excluded_dct, request_keys)
search_vector = ""
if 'search_vector' in dct:
search_vector = dct.pop('search_vector')