klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith.git synced 2025-07-11 04:19:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

forum and core: remove CanViewSearchMixin and use specialized view instead

Browse Source
This commit is contained in:
Antoine Bartuccio
2018-12-07 11:49:06 +01:00
committed by Skia
parent 1de77f2fdd
commit 884855c178
3 changed files with 13 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
forum/views.py
View File

@ -42,19 +42,26 @@ from core.views import (
CanEditMixin,
CanEditPropMixin,
CanCreateMixin,
CanViewSearchMixin,
can_view,
)
from core.views.forms import MarkdownInput
from forum.models import Forum, ForumMessage, ForumTopic, ForumMessageMeta
from haystack.query import SearchQuerySet
class ForumSearchView(CanViewSearchMixin, ListView):
class ForumSearchView(ListView):
template_name = "forum/search.jinja"
def get_queryset(self):
query = self.request.GET.get("query", "")
return SearchQuerySet().models(ForumMessage).autocomplete(auto=query)
queryset = SearchQuerySet().models(ForumMessage).autocomplete(auto=query)
excluded = [
o.object.id
for o in queryset
if not can_view(o.object.topic, self.request.user)
]
queryset.exclude(id__in=excluded)
return [r.object for r in queryset]
class ForumMainView(ListView):