From 0190d91268b74de17b36d6b4c566b355f560b5b6 Mon Sep 17 00:00:00 2001
From: Jean-Marie Favreau <j-marie.favreau@uca.fr>
Date: Sat, 23 Nov 2024 00:06:48 +0100
Subject: [PATCH] =?UTF-8?q?On=20ajoute=20les=20organisateurs=20dans=20les?=
 =?UTF-8?q?=20r=C3=A9sultats=20de=20recherche?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/agenda_culturel/search.html           | 13 +++++++++++++
 src/agenda_culturel/views.py                        |  3 +++
 2 files changed, 16 insertions(+)

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 @@
         </div>
         {% endif %}
 
+        {% if organisations %}
+        <div class="message info">
+            {% if organisations.count > 1 %}
+            Retrouvez les événements correspondant aux organisateurs
+            {% else %}
+            Retrouvez les événements correspondant à l'organisateur
+            {% endif %}
+            {% for o in organisations %}
+                <a href="{{ o.get_absolute_url }}">{{ o }}</a>
+            {% endfor %}
+        </div>
+        {% endif %}
+
         <p>{{ paginator_filter.paginator.count }} événement{{paginator_filter.object_list.count | pluralize }} correspond{{paginator_filter.object_list.count | pluralize:"ent" }} à la recherche.</p>
         <div>
         {% 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,