CGM_Public/pretix_original
2
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-05-06 15:24:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Calendar: Do not show next week if a same-day slot is still running

Browse Source
This commit is contained in:
Raphael Michel
2021-06-27 18:19:03 +02:00
parent 38ffd7d6ba
commit 6da8caaa2b
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/pretix/presale/views/organizer.py
View File

@@ -172,9 +172,9 @@ class EventListMixin:
def _set_month_to_next_subevent(self): def _set_month_to_next_subevent(self):
tz = pytz.timezone(self.request.event.settings.timezone) tz = pytz.timezone(self.request.event.settings.timezone)
next_sev = self.request.event.subevents.using(settings.DATABASE_REPLICA).filter( next_sev = self.request.event.subevents.using(settings.DATABASE_REPLICA).filter(
Q(date_from__gte=now()) | Q(date_to__isnull=False, date_to__gte=now()),
active=True, active=True,
is_public=True, is_public=True,
date_from__gte=now()
).select_related('event').order_by('date_from').first() ).select_related('event').order_by('date_from').first()
if next_sev: if next_sev:
@@ -187,19 +187,19 @@ class EventListMixin:
def _set_month_to_next_event(self): def _set_month_to_next_event(self):
next_ev = filter_qs_by_attr(Event.objects.using(settings.DATABASE_REPLICA).filter( next_ev = filter_qs_by_attr(Event.objects.using(settings.DATABASE_REPLICA).filter(
Q(date_from__gte=now()) | Q(date_to__isnull=False, date_to__gte=now()),
organizer=self.request.organizer, organizer=self.request.organizer,
live=True, live=True,
is_public=True, is_public=True,
date_from__gte=now(),
has_subevents=False has_subevents=False
), self.request).order_by('date_from').first() ), self.request).order_by('date_from').first()
next_sev = filter_qs_by_attr(SubEvent.objects.using(settings.DATABASE_REPLICA).filter( next_sev = filter_qs_by_attr(SubEvent.objects.using(settings.DATABASE_REPLICA).filter(
Q(date_from__gte=now()) | Q(date_to__isnull=False, date_to__gte=now()),
event__organizer=self.request.organizer, event__organizer=self.request.organizer,
event__is_public=True, event__is_public=True,
event__live=True, event__live=True,
active=True, active=True,
is_public=True, is_public=True,
date_from__gte=now()
), self.request).select_related('event').order_by('date_from').first() ), self.request).select_related('event').order_by('date_from').first()
datetime_from = None datetime_from = None
@@ -238,9 +238,9 @@ class EventListMixin:
def _set_week_to_next_subevent(self): def _set_week_to_next_subevent(self):
tz = pytz.timezone(self.request.event.settings.timezone) tz = pytz.timezone(self.request.event.settings.timezone)
next_sev = self.request.event.subevents.using(settings.DATABASE_REPLICA).filter( next_sev = self.request.event.subevents.using(settings.DATABASE_REPLICA).filter(
Q(date_from__gte=now()) | Q(date_to__isnull=False, date_to__gte=now()),
active=True, active=True,
is_public=True, is_public=True,
date_from__gte=now()
).select_related('event').order_by('date_from').first() ).select_related('event').order_by('date_from').first()
if next_sev: if next_sev:
@@ -253,19 +253,19 @@ class EventListMixin:
def _set_week_to_next_event(self): def _set_week_to_next_event(self):
next_ev = filter_qs_by_attr(Event.objects.using(settings.DATABASE_REPLICA).filter( next_ev = filter_qs_by_attr(Event.objects.using(settings.DATABASE_REPLICA).filter(
Q(date_from__gte=now()) | Q(date_to__isnull=False, date_to__gte=now()),
organizer=self.request.organizer, organizer=self.request.organizer,
live=True, live=True,
is_public=True, is_public=True,
date_from__gte=now(),
has_subevents=False has_subevents=False
), self.request).order_by('date_from').first() ), self.request).order_by('date_from').first()
next_sev = filter_qs_by_attr(SubEvent.objects.using(settings.DATABASE_REPLICA).filter( next_sev = filter_qs_by_attr(SubEvent.objects.using(settings.DATABASE_REPLICA).filter(
Q(date_from__gte=now()) | Q(date_to__isnull=False, date_to__gte=now()),
event__organizer=self.request.organizer, event__organizer=self.request.organizer,
event__is_public=True, event__is_public=True,
event__live=True, event__live=True,
active=True, active=True,
is_public=True, is_public=True,
date_from__gte=now()
), self.request).select_related('event').order_by('date_from').first() ), self.request).select_related('event').order_by('date_from').first()
datetime_from = None datetime_from = None