X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/389dfe31994fdc9e835af751b59e784d49f9e175..13f00004251eb9a3c6f62b5a176179a782319540:/forum_modules/mysqlfulltext/startup.py diff --git a/forum_modules/mysqlfulltext/startup.py b/forum_modules/mysqlfulltext/startup.py index 232bbb4..1b12517 100644 --- a/forum_modules/mysqlfulltext/startup.py +++ b/forum_modules/mysqlfulltext/startup.py @@ -8,7 +8,7 @@ from forum.models.question import Question, QuestionManager from forum.models.node import Node from forum.modules import decorate -VERSION = 2 +VERSION = 4 f_name = None @@ -43,7 +43,7 @@ word_re = re.compile(r'\w+', re.UNICODE) def question_search(self, keywords): keywords = keywords.upper() - return '-ranking', self.filter( + qs = self.filter( models.Q(ftsindex__body__isnull=False) ).extra( select={ @@ -54,4 +54,5 @@ def question_search(self, keywords): """, }, select_params=[keywords, keywords, keywords] - ) + ).filter(Q(title__search=keywords) | Q(tagnames__search=keywords) | Q(body__search=keywords)) + return '-ranking', qs