diff --git a/src/agenda_culturel/templates/agenda_culturel/search.html b/src/agenda_culturel/templates/agenda_culturel/search.html index 2626bc3..082cdae 100644 --- a/src/agenda_culturel/templates/agenda_culturel/search.html +++ b/src/agenda_culturel/templates/agenda_culturel/search.html @@ -74,6 +74,19 @@ {% endif %} + {% if organisations %} +
+ {% if organisations.count > 1 %} + Retrouvez les événements correspondant aux organisateurs + {% else %} + Retrouvez les événements correspondant à l'organisateur + {% endif %} + {% for o in organisations %} + {{ o }} + {% endfor %} +
+ {% endif %} +

{{ paginator_filter.paginator.count }} événement{{paginator_filter.object_list.count | pluralize }} correspond{{paginator_filter.object_list.count | pluralize:"ent" }} à la recherche.

{% for obj in paginator_filter %} diff --git a/src/agenda_culturel/views.py b/src/agenda_culturel/views.py index d0183d6..57b39b8 100644 --- a/src/agenda_culturel/views.py +++ b/src/agenda_culturel/views.py @@ -917,6 +917,7 @@ def event_search(request, full=False): categories = None tags = None places = None + organisations = None qs = get_event_qs(request).order_by("-start_day") if not request.user.is_authenticated: @@ -944,6 +945,7 @@ def event_search(request, full=False): tags.sort(key=lambda x: x[1]) 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'])) + organisations = Organisation.objects.filter(Q(name__icontains=request.GET['q'])|Q(description__icontains=request.GET['q'])) paginator = PaginatorFilter(filter, 10, request) page = request.GET.get("page") @@ -964,6 +966,7 @@ def event_search(request, full=False): "categories": categories, "tags": tags, "places": places, + "organisations": organisations, "has_results": len(request.GET) != 0 or (len(request.GET) > 1 and "page" in request.GET), "paginator_filter": response,