CGM_Public/pretix_cgo
1
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions Activity

Minor compatibility refactoring

Browse Source
This commit is contained in:
Raphael Michel
2018-01-31 18:46:07 +01:00
parent e78a176e9f
commit e72b5893c4
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -111,8 +111,8 @@ class OrganizerIndex(OrganizerViewMixin, ListView):
return qs.order_by(order) return qs.order_by(order)
def add_events_for_days(request, organizer, before, after, ebd, timezones): def add_events_for_days(request, baseqs, before, after, ebd, timezones):
qs = organizer.events.filter(is_public=True, live=True, has_subevents=False).filter( qs = baseqs.filter(is_public=True, live=True, has_subevents=False).filter(
Q(Q(date_to__gte=before) & Q(date_from__lte=after)) | Q(Q(date_to__gte=before) & Q(date_from__lte=after)) |
Q(Q(date_from__lte=after) & Q(date_to__gte=before)) | Q(Q(date_from__lte=after) & Q(date_to__gte=before)) |
Q(Q(date_to__isnull=True) & Q(date_from__gte=before) & Q(date_from__lte=after)) Q(Q(date_to__isnull=True) & Q(date_from__gte=before) & Q(date_from__lte=after))
@@ -121,7 +121,8 @@ def add_events_for_days(request, organizer, before, after, ebd, timezones):
).prefetch_related( ).prefetch_related(
'_settings_objects', 'organizer___settings_objects' '_settings_objects', 'organizer___settings_objects'
) )
qs = filter_qs_by_attr(qs, request) if hasattr(request, 'organizer'):
qs = filter_qs_by_attr(qs, request)
for event in qs: for event in qs:
timezones.add(event.settings.timezones) timezones.add(event.settings.timezones)
tz = pytz.timezone(event.settings.timezone) tz = pytz.timezone(event.settings.timezone)
@@ -226,6 +227,7 @@ class CalendarView(OrganizerViewMixin, TemplateView):
self.month = now().month self.month = now().month
else: else:
next_ev = filter_qs_by_attr(Event.objects.filter( next_ev = filter_qs_by_attr(Event.objects.filter(
event__organizer=self.request.organizer,
live=True, live=True,
is_public=True, is_public=True,
date_from__gte=now(), date_from__gte=now(),
@@ -277,7 +279,7 @@ class CalendarView(OrganizerViewMixin, TemplateView):
def _events_by_day(self, before, after): def _events_by_day(self, before, after):
ebd = defaultdict(list) ebd = defaultdict(list)
timezones = set() timezones = set()
add_events_for_days(self.request, self.request.organizer, before, after, ebd, timezones) add_events_for_days(self.request, self.request.organizer.events, before, after, ebd, timezones)
add_subevents_for_days(filter_qs_by_attr(SubEvent.objects.filter( add_subevents_for_days(filter_qs_by_attr(SubEvent.objects.filter(
event__organizer=self.request.organizer, event__organizer=self.request.organizer,
event__is_public=True, event__is_public=True,