From e767babd8e17aca2e46ab2d123b5dde472498493 Mon Sep 17 00:00:00 2001
From: Jean-Marie Favreau <j-marie.favreau@uca.fr>
Date: Thu, 14 Nov 2024 23:24:06 +0100
Subject: [PATCH] Tentative de corriger ce truc de cache

---
 src/agenda_culturel/templates/agenda_culturel/page-month.html  | 2 +-
 .../templates/agenda_culturel/page-upcoming.html               | 2 +-
 src/agenda_culturel/templates/agenda_culturel/page-week.html   | 3 +--
 src/agenda_culturel/views.py                                   | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/agenda_culturel/templates/agenda_culturel/page-month.html b/src/agenda_culturel/templates/agenda_culturel/page-month.html
index d82fac7..86aadb5 100644
--- a/src/agenda_culturel/templates/agenda_culturel/page-month.html
+++ b/src/agenda_culturel/templates/agenda_culturel/page-month.html
@@ -30,7 +30,7 @@
 
  {% get_current_language as LANGUAGE_CODE %}
  {% with cache_timeout=user.is_authenticated|yesno:"30,600" %}
- {% cache cache_timeout month user.is_authenticated calendar.firstdate filter.to_str LANGUAGE_CODE %}
+ {% cache cache_timeout month user.is_authenticated calendar.firstdate filter.get_url LANGUAGE_CODE %}
 
  <article>
     <header>
diff --git a/src/agenda_culturel/templates/agenda_culturel/page-upcoming.html b/src/agenda_culturel/templates/agenda_culturel/page-upcoming.html
index ada11fd..db13691 100644
--- a/src/agenda_culturel/templates/agenda_culturel/page-upcoming.html
+++ b/src/agenda_culturel/templates/agenda_culturel/page-upcoming.html
@@ -39,7 +39,7 @@
 
      {% get_current_language as LANGUAGE_CODE %}
      {% with cache_timeout=user.is_authenticated|yesno:"30,600" %}
-     {% cache cache_timeout upcoming user.is_authenticated calendar.firstdate filter.to_str calendar.calendar_days_list|length LANGUAGE_CODE %}
+     {% cache cache_timeout upcoming user.is_authenticated calendar.firstdate filter.get_url calendar.calendar_days_list|length LANGUAGE_CODE %}
     
     <footer>
     <a href="{% if calendar.calendar_days_list|length == 1 %}{% url 'day_view' date_pred.year date_pred.month date_pred.day %}{% else %}{% url 'a_venir_jour' date_pred.year date_pred.month date_pred.day %}{% endif %}" aria-label="dates précédentes" role="button">
diff --git a/src/agenda_culturel/templates/agenda_culturel/page-week.html b/src/agenda_culturel/templates/agenda_culturel/page-week.html
index 06484bc..cff940f 100644
--- a/src/agenda_culturel/templates/agenda_culturel/page-week.html
+++ b/src/agenda_culturel/templates/agenda_culturel/page-week.html
@@ -23,10 +23,9 @@
 
  {% include "agenda_culturel/filter-inc.html" with filter=filter noarticle=0 %}
 
-
  {% get_current_language as LANGUAGE_CODE %}
  {% with cache_timeout=user.is_authenticated|yesno:"30,600" %}
- {% cache cache_timeout week user.is_authenticated calendar.firstdate filter.to_str LANGUAGE_CODE %}
+ {% cache cache_timeout week user.is_authenticated calendar.firstdate filter.get_url LANGUAGE_CODE %}
 
 <article>
     <header>
diff --git a/src/agenda_culturel/views.py b/src/agenda_culturel/views.py
index 4f6dbca..45fb63a 100644
--- a/src/agenda_culturel/views.py
+++ b/src/agenda_culturel/views.py
@@ -322,7 +322,7 @@ class EventFilter(django_filters.FilterSet):
 
     def to_str(self, prefix=''):
         self.form.full_clean()
-        result = ' '.join([c.name for c in self.get_categories()] + [t for t in self.get_tags()] + [str(self.get_position()), str(self.get_radius())])
+        result = ' '.join([c.name for c in self.get_categories()] + [t for t in self.get_tags()] + ["~" + t for t in self.get_exclude_tags()]  + [str(self.get_position()), str(self.get_radius())])
         if len(result) > 0:
             result = prefix + result
         return result