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

Fix #735 -- Display of event series on public organizer page (#753)

Browse Source
This commit is contained in:
Mohit Jindal
2018-03-03 15:54:07 +05:30
committed by Raphael Michel
parent 303b9912ff
commit 3019a31fbb
2 changed files with 31 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/pretix/base/models/event.py
View File

@@ -100,7 +100,7 @@ class EventMixin:
def get_date_range_display(self, tz=None) -> str: def get_date_range_display(self, tz=None) -> str:
""" """
Returns a formatted string containing the start date and the event date Returns a formatted string containing the start date and the end date
of the event with respect to the current locale and to the ``show_times`` and of the event with respect to the current locale and to the ``show_times`` and
``show_date_to`` settings. ``show_date_to`` settings.
""" """

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

@@ -4,7 +4,8 @@ from datetime import date, datetime, timedelta
import pytz import pytz
from django.conf import settings from django.conf import settings
from django.db.models import Exists, OuterRef, Q from django.db.models import Exists, Max, Min, OuterRef, Q
from django.db.models.functions import Coalesce, Greatest
from django.http import HttpResponse from django.http import HttpResponse
from django.utils.decorators import method_decorator from django.utils.decorators import method_decorator
from django.utils.timezone import now from django.utils.timezone import now
@@ -98,17 +99,36 @@ class OrganizerIndex(OrganizerViewMixin, ListView):
def get_queryset(self): def get_queryset(self):
query = Q(is_public=True) & Q(live=True) query = Q(is_public=True) & Q(live=True)
if "old" in self.request.GET: qs = self.request.organizer.events.filter(query)
query &= Q(Q(date_from__lte=now()) & Q(date_to__lte=now())) qs = qs.annotate(
order = '-date_from' min_from=Min('subevents__date_from'),
else: min_to=Min('subevents__date_to'),
query &= Q(Q(date_from__gte=now()) | Q(date_to__gte=now())) max_from=Max('subevents__date_from'),
order = 'date_from' max_to=Max('subevents__date_to'),
qs = Event.objects.filter( max_fromto=Greatest(Max('subevents__date_to'), Max('subevents__date_from')),
Q(organizer=self.request.organizer) & query
) )
if "old" in self.request.GET:
qs = qs.filter(
Q(Q(has_subevents=False) & Q(
Q(date_to__lt=now()) | Q(Q(date_to__isnull=True) & Q(date_from__lt=now()))
)) | Q(Q(has_subevents=True) & Q(
Q(min_to__lt=now()) | Q(min_from__lt=now()))
)
).annotate(
order_to=Coalesce('max_fromto', 'max_to', 'max_from', 'date_to', 'date_from'),
).order_by('-order_to')
else:
qs = qs.filter(
Q(Q(has_subevents=False) & Q(
Q(date_to__gte=now()) | Q(Q(date_to__isnull=True) & Q(date_from__gte=now()))
)) | Q(Q(has_subevents=True) & Q(
Q(max_to__gte=now()) | Q(max_from__gte=now()))
)
).annotate(
order_from=Coalesce('min_from', 'date_from'),
).order_by('order_from')
qs = filter_qs_by_attr(qs, self.request) qs = filter_qs_by_attr(qs, self.request)
return qs.order_by(order) return qs
def add_events_for_days(request, baseqs, before, after, ebd, timezones): def add_events_for_days(request, baseqs, before, after, ebd, timezones):