setop/agenda_culturel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ajout des imports récurrents dans les résultats de la recherche

Browse Source
This commit is contained in:
Jean-Marie Favreau 2024-11-23 00:34:17 +01:00
parent 70260fcb4f
commit 918e19fa4f
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/agenda_culturel/templates/agenda_culturel/search.html
View File

@ -69,7 +69,7 @@
Retrouvez les événements se déroulant dans le lieu Retrouvez les événements se déroulant dans le lieu
{% endif %} {% endif %}
{% for p in places %} {% for p in places %}
<a href="{{ p.get_absolute_url }}">{{ p.name }}</a>{% if not forloop.last %},{% endif %} <a href="{{ p.get_absolute_url }}">{{ p.name }}</a>{% if not forloop.last %}, {% endif %}
{% endfor %} {% endfor %}
</div> </div>
{% endif %} {% endif %}
@ -82,7 +82,20 @@
Retrouvez les événements correspondant à l'organisateur Retrouvez les événements correspondant à l'organisateur
{% endif %} {% endif %}
{% for o in organisations %} {% for o in organisations %}
<a href="{{ o.get_absolute_url }}">{{ o }}</a> <a href="{{ o.get_absolute_url }}">{{ o }}</a>{% if not forloop.last %}, {% endif %}
{% endfor %}
</div>
{% endif %}
{% if rimports and user.is_authenticated %}
<div class="message info">
{% if rimports.count > 1 %}
Import récurrent correspondant à la recherche&nbsp;:
{% else %}
Imports récurrents correspondant à la recherche&nbsp;:
{% endif %}
{% for r in rimports %}
<a href="{{ r.get_absolute_url }}">{{ r }}</a>{% if not forloop.last %}, {% endif %}
{% endfor %} {% endfor %}
</div> </div>
{% endif %} {% endif %}

4
src/agenda_culturel/views.py
View File

@ -918,6 +918,7 @@ def event_search(request, full=False):
tags = None tags = None
places = None places = None
organisations = None organisations = None
rimports = None
qs = get_event_qs(request).order_by("-start_day") qs = get_event_qs(request).order_by("-start_day")
if not request.user.is_authenticated: if not request.user.is_authenticated:
@ -946,6 +947,8 @@ def event_search(request, full=False):
tags = [t[0] for t in tags] tags = [t[0] for t in tags]
places = Place.objects.filter(Q(name__icontains=request.GET['q'])|Q(description__icontains=request.GET['q'])|Q(city__icontains=request.GET['q'])) places = Place.objects.filter(Q(name__icontains=request.GET['q'])|Q(description__icontains=request.GET['q'])|Q(city__icontains=request.GET['q']))
organisations = Organisation.objects.filter(Q(name__icontains=request.GET['q'])|Q(description__icontains=request.GET['q'])) organisations = Organisation.objects.filter(Q(name__icontains=request.GET['q'])|Q(description__icontains=request.GET['q']))
if request.user.is_authenticated:
rimports = RecurrentImport.objects.filter(name__icontains=request.GET['q'])
paginator = PaginatorFilter(filter, 10, request) paginator = PaginatorFilter(filter, 10, request)
page = request.GET.get("page") page = request.GET.get("page")
@ -967,6 +970,7 @@ def event_search(request, full=False):
"tags": tags, "tags": tags,
"places": places, "places": places,
"organisations": organisations, "organisations": organisations,
"rimports": rimports,
"has_results": len(request.GET) != 0 "has_results": len(request.GET) != 0
or (len(request.GET) > 1 and "page" in request.GET), or (len(request.GET) > 1 and "page" in request.GET),
"paginator_filter": response, "paginator_filter": response,