diff --git a/src/agenda_culturel/templates/agenda_culturel/search.html b/src/agenda_culturel/templates/agenda_culturel/search.html index 082cdae..f57c52f 100644 --- a/src/agenda_culturel/templates/agenda_culturel/search.html +++ b/src/agenda_culturel/templates/agenda_culturel/search.html @@ -69,7 +69,7 @@ Retrouvez les événements se déroulant dans le lieu {% endif %} {% for p in places %} - {{ p.name }}{% if not forloop.last %},{% endif %} + {{ p.name }}{% if not forloop.last %}, {% endif %} {% endfor %} {% endif %} @@ -82,7 +82,20 @@ Retrouvez les événements correspondant à l'organisateur {% endif %} {% for o in organisations %} - {{ o }} + {{ o }}{% if not forloop.last %}, {% endif %} + {% endfor %} + + {% endif %} + + {% if rimports and user.is_authenticated %} +
{% endif %} diff --git a/src/agenda_culturel/views.py b/src/agenda_culturel/views.py index 57b39b8..66076d2 100644 --- a/src/agenda_culturel/views.py +++ b/src/agenda_culturel/views.py @@ -918,6 +918,7 @@ def event_search(request, full=False): tags = None places = None organisations = None + rimports = None qs = get_event_qs(request).order_by("-start_day") if not request.user.is_authenticated: @@ -946,6 +947,8 @@ def event_search(request, full=False): 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'])) + if request.user.is_authenticated: + rimports = RecurrentImport.objects.filter(name__icontains=request.GET['q']) paginator = PaginatorFilter(filter, 10, request) page = request.GET.get("page") @@ -967,6 +970,7 @@ def event_search(request, full=False): "tags": tags, "places": places, "organisations": organisations, + "rimports": rimports, "has_results": len(request.GET) != 0 or (len(request.GET) > 1 and "page" in request.GET), "paginator_filter": response,