From bb6bebc5a72b581b685c6250240f6781c7960138 Mon Sep 17 00:00:00 2001 From: Jean-Marie Favreau Date: Sun, 7 Jan 2024 10:43:27 +0100 Subject: [PATCH] =?UTF-8?q?on=20am=C3=A9liore=20la=20d=C3=A9tection=20des?= =?UTF-8?q?=20r=C3=A9currences?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/agenda_culturel/models.py | 3 +++ .../agenda_culturel/single-event/event-in-flat-list-inc.html | 2 +- .../agenda_culturel/single-event/event-in-list-by-day-inc.html | 2 +- .../agenda_culturel/single-event/event-single-inc.html | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/agenda_culturel/models.py b/src/agenda_culturel/models.py index 5c1ddb5..a74eecf 100644 --- a/src/agenda_culturel/models.py +++ b/src/agenda_culturel/models.py @@ -303,6 +303,9 @@ class Event(models.Model): return result + def has_recurrences(self): + # TODO: see https://forge.chapril.org/jmtrivial/agenda_culturel/issues/65 + return self.recurrences is not None and len(self.recurrences.rrules) != 0 def update_recurrence_dtstartend(self): sday = date.fromisoformat(self.start_day) if isinstance(self.start_day, str) else self.start_day diff --git a/src/agenda_culturel/templates/agenda_culturel/single-event/event-in-flat-list-inc.html b/src/agenda_culturel/templates/agenda_culturel/single-event/event-in-flat-list-inc.html index 5cf74c7..f3e2d7f 100644 --- a/src/agenda_culturel/templates/agenda_culturel/single-event/event-in-flat-list-inc.html +++ b/src/agenda_culturel/templates/agenda_culturel/single-event/event-in-flat-list-inc.html @@ -10,7 +10,7 @@ {% if event.end_day %}du{% else %}le{% endif %} {% include "agenda_culturel/date-times-inc.html" with event=event %} {% picto_from_name "map-pin" %} - {% if event.recurrences %} + {% if event.has_recurrences %}

Cet événement est disponible uniquement sur les nuits énimagmatiques.

{% endif %} - {% if event.recurrences %} + {% if event.has_recurrences %}

À notre connaissance, cet événement n'est pas référencé autre part sur internet.

{% endif %} - {% if event.recurrences %} + {% if event.has_recurrences %}