diff options
author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2013-02-21 17:19:06 -0300 |
---|---|---|
committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2013-02-21 17:19:06 -0300 |
commit | 0b05b5bd15591f0795992787252d9dc5d9a9aab5 (patch) | |
tree | 747dc9f6d53d07089a7a1e2d996cf6a876f7c995 | |
parent | 0216dce8071572545df995050c41fce3239b24a7 (diff) | |
download | askbot-0b05b5bd15591f0795992787252d9dc5d9a9aab5.tar.gz askbot-0b05b5bd15591f0795992787252d9dc5d9a9aab5.tar.bz2 askbot-0b05b5bd15591f0795992787252d9dc5d9a9aab5.zip |
fixed user search bug in postgresql
-rw-r--r-- | askbot/models/__init__.py | 2 | ||||
-rw-r--r-- | askbot/search/postgresql/__init__.py | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/askbot/models/__init__.py b/askbot/models/__init__.py index 32e30add..c4f4454c 100644 --- a/askbot/models/__init__.py +++ b/askbot/models/__init__.py @@ -113,7 +113,7 @@ def get_users_by_text_query(search_query, users_query_set = None): users_query_set = User.objects.all() if 'postgresql_psycopg2' in askbot.get_database_engine_name(): from askbot.search import postgresql - return postgresql.run_thread_search(users_query_set, search_query) + return postgresql.run_user_search(users_query_set, search_query) else: return users_query_set.filter( models.Q(username__icontains=search_query) | diff --git a/askbot/search/postgresql/__init__.py b/askbot/search/postgresql/__init__.py index 3edef65d..e42190a8 100644 --- a/askbot/search/postgresql/__init__.py +++ b/askbot/search/postgresql/__init__.py @@ -65,7 +65,9 @@ def run_full_text_search(query_set, query_text, text_search_vector_name): language_code = get_language() - if getattr(django_settings, 'ASKBOT_MULTILINGUAL', True): + #the table name is a hack, because user does not have the language code + is_multilingual = getattr(django_settings, 'ASKBOT_MULTILINGUAL', True) + if is_multilingual and table_name == 'askbot_thread': where_clause += " AND " + table_name + \ '.' + "language_code='" + language_code + "'" @@ -85,6 +87,8 @@ def run_thread_search(query_set, query): """runs search for full thread content""" return run_full_text_search(query_set, query, 'text_search_vector'); +run_user_search = run_thread_search #an alias + def run_title_search(query_set, query): """runs search for title and tags""" return run_full_text_search(query_set, query, 'title_search_vector') |