klmp200
/
Sith
mirror of https://github.com/ae-utbm/sith3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adapt forum search to xapian and improve query

This commit is contained in:
Antoine Bartuccio 2018-12-05 14:05:47 +01:00 committed by Skia
parent 9b8a881914
commit 286ba91c75
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/middleware.py
View File

@ -27,7 +27,7 @@ from django.conf import settings
from django.utils.functional import SimpleLazyObject
from django.contrib.auth import get_user
from django.contrib.auth.middleware import (
AuthenticationMiddleware as DjangoAuthenticationMiddleware
AuthenticationMiddleware as DjangoAuthenticationMiddleware,
)
module, klass = settings.AUTH_ANONYMOUS_MODEL.rsplit(".", 1)

3
core/templates/search/indexes/forum/forummessage_text.txt
View File

@ -1 +1,4 @@
{{ object.topic }}
{{ object.title }}
{{ object.message }}
{{ object.author }}

2
forum/views.py
View File

@ -47,7 +47,7 @@ class ForumSearchView(ListView):
def get_queryset(self):
query = self.request.GET.get("query", "")
q = SearchQuerySet().models(ForumMessage).filter(text=query)
q = SearchQuerySet().models(ForumMessage).filter_or(text__contains=query)
return [r.object for r in q]