From 2478a671bfaff8043cc45ec04e92e4be2f2d76ed Mon Sep 17 00:00:00 2001
From: Jean-Marie Favreau <j-marie.favreau@uca.fr>
Date: Tue, 29 Oct 2024 23:46:11 +0100
Subject: [PATCH] =?UTF-8?q?On=20am=C3=A9liore=20les=20urls=20des=20lieux?=
 =?UTF-8?q?=20pour=20le=20r=C3=A9f=C3=A9rencement?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/agenda_culturel/models.py                                 | 2 +-
 .../templates/agenda_culturel/event-location-inc.html         | 2 +-
 .../templates/agenda_culturel/place_detail.html               | 2 +-
 src/agenda_culturel/templates/agenda_culturel/place_list.html | 4 ++--
 .../templates/agenda_culturel/place_list_admin.html           | 2 +-
 src/agenda_culturel/urls.py                                   | 2 ++
 6 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/agenda_culturel/models.py b/src/agenda_culturel/models.py
index 5af3ee3..9f1534a 100644
--- a/src/agenda_culturel/models.py
+++ b/src/agenda_culturel/models.py
@@ -332,7 +332,7 @@ class Place(models.Model):
             return self.name + ", " + self.city
 
     def get_absolute_url(self):
-        return reverse("view_place", kwargs={"pk": self.pk})
+        return reverse("view_place_fullname", kwargs={"pk": self.pk, "extra": slugify(self.name)})
 
     def nb_events(self):
         return Event.objects.filter(exact_location=self).count()
diff --git a/src/agenda_culturel/templates/agenda_culturel/event-location-inc.html b/src/agenda_culturel/templates/agenda_culturel/event-location-inc.html
index 7f51fab..a237b1f 100644
--- a/src/agenda_culturel/templates/agenda_culturel/event-location-inc.html
+++ b/src/agenda_culturel/templates/agenda_culturel/event-location-inc.html
@@ -3,7 +3,7 @@
     {% if nolink %}
         {{ event.exact_location.name }}, {{ event.exact_location.city }}
     {% else %}
-        <a href="{% url 'view_place' event.exact_location.pk %}">{{ event.exact_location.name }}, {{ event.exact_location.city }}</a>
+        <a href="{{ event.exact_location.get_absolute_url }}">{{ event.exact_location.name }}, {{ event.exact_location.city }}</a>
     {% endif %}
 {% else %}
     {% if perms.agenda_culturel.change_event and perms.agenda_culturel.change_place %}
diff --git a/src/agenda_culturel/templates/agenda_culturel/place_detail.html b/src/agenda_culturel/templates/agenda_culturel/place_detail.html
index e53095f..0a93c29 100644
--- a/src/agenda_culturel/templates/agenda_culturel/place_detail.html
+++ b/src/agenda_culturel/templates/agenda_culturel/place_detail.html
@@ -69,7 +69,7 @@
     {% cache cache_timeout place_list user.is_authenticated object page_obj.number past %}
     <div class="slide-buttons">
         {% if past %}
-        <a href="{% url 'view_place' object.pk %}" role="button">Voir les événements à venir</a>
+        <a href="{{ object.get_absolute_url }}" role="button">Voir les événements à venir</a>
         {% else %}
         <a href="{% url 'view_place_past' object.pk %}" role="button">Voir les événements passés</a>
         {% endif %}
diff --git a/src/agenda_culturel/templates/agenda_culturel/place_list.html b/src/agenda_culturel/templates/agenda_culturel/place_list.html
index 246b49b..87cb4c5 100644
--- a/src/agenda_culturel/templates/agenda_culturel/place_list.html
+++ b/src/agenda_culturel/templates/agenda_culturel/place_list.html
@@ -42,7 +42,7 @@
         
         {% if object_list %}
         {% for place in object_list %}
-            <h3><a href="{% url 'view_place' place.pk %}">{{ place.name }}</a> — <a id="open-map-{{ place.id }}" href="#map_location" data-tooltip="afficher sur la carte">{% picto_from_name "map" %}</a></h3>
+            <h3><a href="{{ place.get_absolute_url }}">{{ place.name }}</a> — <a id="open-map-{{ place.id }}" href="#map_location" data-tooltip="afficher sur la carte">{% picto_from_name "map" %}</a></h3>
             <ul>
                 <li><strong>Adresse&nbsp;:</strong> {% if place.address %}{{ place.address }}, {% endif %}{{ place.city }}</li>
                 <li><strong>Coordonnée GPS&nbsp;:</strong> {{ place.location }}</li>
@@ -74,7 +74,7 @@
     window.mMapping = {};
     {% if object_list %}
         {% for place in object_list %}
-        markerArray.push(L.marker([{{ place.location|tocoords }}]).bindPopup('<a href="{% url 'view_place' place.pk %}">{{ place.name }}</a><br />{% if place.address %}{{ place.address }}, {% endif %}{{ place.city }}'))
+        markerArray.push(L.marker([{{ place.location|tocoords }}]).bindPopup('<a href="{{ place.get_absolute_url }}">{{ place.name }}</a><br />{% if place.address %}{{ place.address }}, {% endif %}{{ place.city }}'))
         markers.addLayer(markerArray[markerArray.length - 1]);
         window.mMapping[{{ place.id }}] = markerArray[markerArray.length - 1];
         window.jQuery('a#open-map-{{ place.id }}').click(function(){ 
diff --git a/src/agenda_culturel/templates/agenda_culturel/place_list_admin.html b/src/agenda_culturel/templates/agenda_culturel/place_list_admin.html
index 596428f..f8fffdc 100644
--- a/src/agenda_culturel/templates/agenda_culturel/place_list_admin.html
+++ b/src/agenda_culturel/templates/agenda_culturel/place_list_admin.html
@@ -31,7 +31,7 @@
       <article>
         <header>
             <div class="slide-buttons">
-                <a href="{% url 'view_place' place.pk %}" role="button">Consulter {% picto_from_name "eye" %}</a>
+                <a href="{{ place.get_absolute_url }}" role="button">Consulter {% picto_from_name "eye" %}</a>
                 <a href="{% url 'edit_place' place.pk %}" role="button">Modifier {% picto_from_name "edit-3" %}</a>
                 <a href="{% url 'delete_place' place.pk %}" role="button">Supprimer {% picto_from_name "trash-2" %}</a>
             </div>
diff --git a/src/agenda_culturel/urls.py b/src/agenda_culturel/urls.py
index 1947586..76eda87 100644
--- a/src/agenda_culturel/urls.py
+++ b/src/agenda_culturel/urls.py
@@ -154,6 +154,8 @@ urlpatterns = [
     path("500/", internal_server_error, name="internal_server_error"),
     path("place/<int:pk>/past", PlaceDetailViewPast.as_view(), name="view_place_past"),
     path("place/<int:pk>", PlaceDetailView.as_view(), name="view_place"),
+    path("place/<int:pk>-<extra>/past", PlaceDetailViewPast.as_view(), name="view_place_past_fullname"),
+    path("place/<int:pk>-<extra>", PlaceDetailView.as_view(), name="view_place_fullname"),
     path("place/<int:pk>/edit", PlaceUpdateView.as_view(), name="edit_place"),
     path("place/<int:pk>/delete", PlaceDeleteView.as_view(), name="delete_place"),
     path("places/", PlaceListView.as_view(), name="view_places"),