From d46989473bc8b55b018bd3e9c33e0da9cf05f83e Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Thu, 15 Dec 2022 14:30:15 +0100 Subject: [PATCH] Customer accounts: Show event date in order list --- .../pretixpresale/organizers/customer_profile.html | 3 +++ src/pretix/presale/views/customer.py | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/pretix/presale/templates/pretixpresale/organizers/customer_profile.html b/src/pretix/presale/templates/pretixpresale/organizers/customer_profile.html index b3162e113..ad3b9bb6f 100644 --- a/src/pretix/presale/templates/pretixpresale/organizers/customer_profile.html +++ b/src/pretix/presale/templates/pretixpresale/organizers/customer_profile.html @@ -91,6 +91,9 @@ {{ o.event }} + {% if not o.event.has_subevents and o.event.settings.show_dates_on_frontpage %} +
{{ o.event.get_date_range_display }} + {% endif %} {{ o.datetime|date:"SHORT_DATETIME_FORMAT" }} diff --git a/src/pretix/presale/views/customer.py b/src/pretix/presale/views/customer.py index 7a8cf39dd..878e0de74 100644 --- a/src/pretix/presale/views/customer.py +++ b/src/pretix/presale/views/customer.py @@ -31,7 +31,9 @@ from django.contrib import messages from django.core.exceptions import ValidationError from django.core.signing import BadSignature, dumps, loads from django.db import IntegrityError, transaction -from django.db.models import Count, IntegerField, OuterRef, Q, Subquery +from django.db.models import ( + Count, IntegerField, OuterRef, Prefetch, Q, Subquery, +) from django.http import Http404, HttpResponseRedirect from django.shortcuts import get_object_or_404, redirect, render from django.utils.crypto import get_random_string @@ -355,7 +357,9 @@ class ProfileView(CustomerRequiredMixin, ListView): q |= Q(email__iexact=self.request.customer.email) qs = Order.objects.filter( q - ).select_related('event').order_by('-datetime') + ).prefetch_related( + Prefetch('event', queryset=self.request.organizer.events.prefetch_related('_settings_objects')) + ).order_by('-datetime') return qs def get_context_data(self, **kwargs):