klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith.git synced 2024-11-26 02:54:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

pedagogy: handle one letter search

Browse Source
This commit is contained in:
Antoine Bartuccio 2019-06-19 02:00:00 +02:00
parent 22c028af11
commit e21821ace5
Signed by: klmp200
GPG Key ID: E7245548C53F904B
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pedagogy/views.py
View File

@ -162,6 +162,7 @@ class UVListView(CanViewMixin, CanCreateUVFunctionMixin, ListView):
) )
def get_queryset(self): def get_queryset(self):
queryset = super(UVListView, self).get_queryset()
search = self.request.GET.get("search", None) search = self.request.GET.get("search", None)
additional_filters = {} additional_filters = {}
@ -178,11 +179,17 @@ class UVListView(CanViewMixin, CanCreateUVFunctionMixin, ListView):
else: else:
additional_filters["semester"] = semester additional_filters["semester"] = semester
queryset = queryset.filter(**additional_filters)
if not search: if not search:
return super(UVListView, self).get_queryset().filter(**additional_filters) return queryset
if len(search) == 1:
# It's a search with only one letter
# Hastack doesn't work well with only one letter
return queryset.filter(code__startswith=search)
try: try:
queryset = ( qs = (
SearchQuerySet() SearchQuerySet()
.models(self.model) .models(self.model)
.autocomplete(auto=html.escape(search)) .autocomplete(auto=html.escape(search))
@ -190,12 +197,7 @@ class UVListView(CanViewMixin, CanCreateUVFunctionMixin, ListView):
except TypeError: except TypeError:
return self.model.objects.none() return self.model.objects.none()
return ( return queryset.filter(id__in=([o.object.id for o in qs]))
super(UVListView, self)
.get_queryset()
.filter(id__in=([o.object.id for o in queryset]))
.filter(**additional_filters)
)
class UVCommentReportCreateView(CreateView): class UVCommentReportCreateView(CreateView):