Event ical feed: Do not show events more than 31 days in the past

This commit is contained in:
Raphael Michel
2022-01-24 15:47:04 +01:00
parent 9d6f11718a
commit 13a86fc6f3

View File

@@ -1108,13 +1108,15 @@ class DayCalendarView(OrganizerViewMixin, EventListMixin, TemplateView):
@method_decorator(cache_page(300), name='dispatch') @method_decorator(cache_page(300), name='dispatch')
class OrganizerIcalDownload(OrganizerViewMixin, View): class OrganizerIcalDownload(OrganizerViewMixin, View):
def get(self, request, *args, **kwargs): def get(self, request, *args, **kwargs):
cutoff = now() - timedelta(days=31)
events = list( events = list(
filter_qs_by_attr( filter_qs_by_attr(
self.request.organizer.events.filter( self.request.organizer.events.filter(
Q(date_from__gt=cutoff) | Q(date_to__gt=cutoff),
is_public=True, is_public=True,
live=True, live=True,
has_subevents=False, has_subevents=False,
sales_channels__contains=self.request.sales_channel.identifier sales_channels__contains=self.request.sales_channel.identifier,
), ),
request request
).order_by( ).order_by(
@@ -1130,6 +1132,7 @@ class OrganizerIcalDownload(OrganizerViewMixin, View):
events += list( events += list(
filter_qs_by_attr( filter_qs_by_attr(
SubEvent.objects.filter( SubEvent.objects.filter(
Q(date_from__gt=cutoff) | Q(date_to__gt=cutoff),
event__organizer=self.request.organizer, event__organizer=self.request.organizer,
event__is_public=True, event__is_public=True,
event__live=True, event__live=True,