jmtrivial/agenda_culturel
4
4
Fork 0
Code Issues 71 Pull Requests 1 Projects 1 Releases Wiki Activity

Correction du filtre d'intégration aux pages des événements

Browse Source
This commit is contained in:
Jean-Marie Favreau 2024-11-10 23:33:21 +01:00
parent 53e5b52711
commit a3255ff460
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/agenda_culturel/calendar.py
View File

@ -234,7 +234,11 @@ class CalendarList:
| Q(recurrence_dtend__lt=startdatetime) | 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()) firstdate = datetime.fromordinal(self.c_firstdate.toordinal())
if firstdate.tzinfo is None or firstdate.tzinfo.utcoffset(firstdate) is None: if firstdate.tzinfo is None or firstdate.tzinfo.utcoffset(firstdate) is None: