forked from CGM_Public/pretix_original
Fix crash from previous deployment
This commit is contained in:
@@ -12,7 +12,7 @@ from django.core.files.storage import default_storage
|
|||||||
from django.core.mail import get_connection
|
from django.core.mail import get_connection
|
||||||
from django.core.validators import RegexValidator
|
from django.core.validators import RegexValidator
|
||||||
from django.db import models
|
from django.db import models
|
||||||
from django.db.models import Exists, OuterRef, Prefetch, Q, Subquery
|
from django.db.models import Exists, OuterRef, Prefetch, Q, Subquery, Value
|
||||||
from django.template.defaultfilters import date as _date
|
from django.template.defaultfilters import date as _date
|
||||||
from django.utils.crypto import get_random_string
|
from django.utils.crypto import get_random_string
|
||||||
from django.utils.formats import date_format
|
from django.utils.formats import date_format
|
||||||
@@ -790,7 +790,10 @@ class Event(EventMixin, LoggedModel):
|
|||||||
'name_descending': ('-name', 'date_from'),
|
'name_descending': ('-name', 'date_from'),
|
||||||
}[ordering]
|
}[ordering]
|
||||||
subevs = queryset.annotate(
|
subevs = queryset.annotate(
|
||||||
has_paid_item=self.cache.get_or_set('has_paid_item', lambda: self.items.filter(default_price__gt=0).exists(), 3600)
|
has_paid_item=Value(
|
||||||
|
self.cache.get_or_set('has_paid_item', lambda: self.items.filter(default_price__gt=0).exists(), 3600),
|
||||||
|
output_field=models.BooleanField()
|
||||||
|
)
|
||||||
).filter(
|
).filter(
|
||||||
Q(active=True) & Q(is_public=True) & (
|
Q(active=True) & Q(is_public=True) & (
|
||||||
Q(Q(date_to__isnull=True) & Q(date_from__gte=now() - timedelta(hours=24)))
|
Q(Q(date_to__isnull=True) & Q(date_from__gte=now() - timedelta(hours=24)))
|
||||||
|
|||||||
@@ -17,7 +17,9 @@ from django.views.generic import ListView, TemplateView
|
|||||||
from pytz import UTC
|
from pytz import UTC
|
||||||
|
|
||||||
from pretix.base.i18n import language
|
from pretix.base.i18n import language
|
||||||
from pretix.base.models import Event, EventMetaValue, SubEvent, SubEventMetaValue
|
from pretix.base.models import (
|
||||||
|
Event, EventMetaValue, SubEvent, SubEventMetaValue,
|
||||||
|
)
|
||||||
from pretix.base.services.quotas import QuotaAvailability
|
from pretix.base.services.quotas import QuotaAvailability
|
||||||
from pretix.helpers.daterange import daterange
|
from pretix.helpers.daterange import daterange
|
||||||
from pretix.helpers.formats.de.formats import WEEK_FORMAT
|
from pretix.helpers.formats.de.formats import WEEK_FORMAT
|
||||||
|
|||||||
Reference in New Issue
Block a user