Skip to content
Snippets Groups Projects
Commit 0295d1c8 authored by Tomáš Valenta's avatar Tomáš Valenta
Browse files

add date to search results

parent 13e5bc07
Branches
No related tags found
2 merge requests!861Release: New homepage design,!857Nicer search
Pipeline #15965 passed
...@@ -1027,22 +1027,25 @@ class MainSearchPage( ...@@ -1027,22 +1027,25 @@ class MainSearchPage(
if request.GET.get("q", "") == "": if request.GET.get("q", "") == "":
return context return context
query = request.GET["q"] search_query = request.GET["q"]
context["global_search_query"] = query context["global_search_query"] = search_query
for model in ( for model in (
MainPersonPage, MainPersonPage,
MainArticlePage, MainArticlePage,
MainSimplePage, MainSimplePage,
): ):
filter = models.Q(title__icontains=query) filter = models.Q(title__icontains=search_query)
if hasattr(model, "perex"): if hasattr(model, "perex"):
filter = filter | models.Q(perex__icontains=query) filter = filter | models.Q(perex__icontains=search_query)
context["results"] += list(model.objects.filter(filter).all()[:15]) results = model.objects.filter(filter)
print(context["results"]) if hasattr(model, "date"):
results = results.order_by("-date")
context["results"] += list(results.all()[:15])
context["results"].sort(key=lambda result: result.title) context["results"].sort(key=lambda result: result.title)
......
...@@ -6,6 +6,10 @@ ...@@ -6,6 +6,10 @@
> >
<h2 class="head-4xl group-hover:underline">{{ title }}</h2> <h2 class="head-4xl group-hover:underline">{{ title }}</h2>
{% if date %}
<span class="text-grey-250">{{ date }}</span>
{% endif %}
{% if perex %} {% if perex %}
<p class="!hover:no-underline"> <p class="!hover:no-underline">
{{ perex }} {{ perex }}
......
...@@ -4,6 +4,6 @@ ...@@ -4,6 +4,6 @@
</div> </div>
{% for result in results %} {% for result in results %}
{% include "main/includes/molecules/search/universal_search_result.html" with url=result.url title=result.title perex=result.perex %} {% include "main/includes/molecules/search/universal_search_result.html" with url=result.url title=result.title date=result.date perex=result.perex %}
{% endfor %} {% endfor %}
</div> </div>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment