diff --git a/src/agenda_culturel/calendar.py b/src/agenda_culturel/calendar.py index 99e094f..ad28967 100644 --- a/src/agenda_culturel/calendar.py +++ b/src/agenda_culturel/calendar.py @@ -234,7 +234,11 @@ class CalendarList: | Q(recurrence_dtend__lt=startdatetime) ) ) - ).filter(Q(other_versions__isnull=True)|~Q(other_versions__representative=F('pk'))).order_by("start_time").prefetch_related("exact_location").prefetch_related("category") + ).filter( + Q(other_versions__isnull=True) | + Q(other_versions__representative=F('pk')) | + Q(other_versions__representative__isnull=True) + ).order_by("start_time").prefetch_related("exact_location").prefetch_related("category").prefetch_related("other_versions") firstdate = datetime.fromordinal(self.c_firstdate.toordinal()) if firstdate.tzinfo is None or firstdate.tzinfo.utcoffset(firstdate) is None: