klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith.git synced 2024-11-22 14:13:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

forum and core: fix error 500 when query is empty on search

Browse Source
This commit is contained in:
Antoine Bartuccio 2018-12-07 13:34:46 +01:00 committed by Skia
parent 65a0b7b2d4
commit 347caa3b6a
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/views/site.py
View File

@ -71,6 +71,8 @@ def notification(request, notif_id):
def search_user(query, as_json=False): def search_user(query, as_json=False):
if query == "":
return []
res = SearchQuerySet().models(User).autocomplete(auto=query)[:20] res = SearchQuerySet().models(User).autocomplete(auto=query)[:20]
return [r.object for r in res] return [r.object for r in res]

2
forum/templates/forum/search.jinja
View File

@ -4,9 +4,9 @@
{% block content %} {% block content %}
<div id="forum"> <div id="forum">
{{ display_search_bar() }}
{% if object_list|length != 0 %} {% if object_list|length != 0 %}
<br> <br>
{{ display_search_bar() }}
<div class="search-results"> <div class="search-results">
{% for m in object_list %} {% for m in object_list %}
{{ display_message(m, user) }} {{ display_message(m, user) }}

2
forum/views.py
View File

@ -54,6 +54,8 @@ class ForumSearchView(ListView):
def get_queryset(self): def get_queryset(self):
query = self.request.GET.get("query", "") query = self.request.GET.get("query", "")
if query == "":
return []
queryset = SearchQuerySet().models(ForumMessage).autocomplete(auto=query)[:100] queryset = SearchQuerySet().models(ForumMessage).autocomplete(auto=query)[:100]
return [ return [
r.object for r in queryset if can_view(r.object.topic, self.request.user) r.object for r in queryset if can_view(r.object.topic, self.request.user)