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

Widget: Return a useful error message on disabled events

Browse Source
This commit is contained in:
Raphael Michel
2019-03-18 20:42:05 +01:00
parent 07b4b8c473
commit ddf6af278c
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/pretix/presale/middleware.py
View File

@@ -14,7 +14,7 @@ class EventMiddleware(MiddlewareMixin):
return return
if 'organizer' in url.kwargs or 'event' in url.kwargs: if 'organizer' in url.kwargs or 'event' in url.kwargs:
redirect = _detect_event(request) redirect = _detect_event(request, require_live=url.url_name != 'event.widget.productlist')
if redirect: if redirect:
return redirect return redirect

15
src/pretix/presale/views/widget.py
View File

@@ -13,7 +13,7 @@ from django.template import Context, Engine
from django.template.loader import get_template from django.template.loader import get_template
from django.utils.formats import date_format from django.utils.formats import date_format
from django.utils.timezone import now from django.utils.timezone import now
from django.utils.translation import gettext from django.utils.translation import ugettext
from django.utils.translation.trans_real import DjangoTranslation from django.utils.translation.trans_real import DjangoTranslation
from django.views import View from django.views import View
from django.views.decorators.cache import cache_page from django.views.decorators.cache import cache_page
@@ -202,6 +202,13 @@ class WidgetAPIProductList(View):
return grps, display_add_to_cart, len(items) return grps, display_add_to_cart, len(items)
def dispatch(self, request, *args, **kwargs): def dispatch(self, request, *args, **kwargs):
if not request.event.live:
resp = JsonResponse({
'error': ugettext('This ticket shop is currently disabled.')
})
resp['Access-Control-Allow-Origin'] = '*'
return resp
self.subevent = None self.subevent = None
if request.event.has_subevents: if request.event.has_subevents:
if 'subevent' in kwargs: if 'subevent' in kwargs:
@@ -238,14 +245,14 @@ class WidgetAPIProductList(View):
if not ev.presale_is_running: if not ev.presale_is_running:
if ev.presale_has_ended: if ev.presale_has_ended:
data['error'] = gettext('The presale period for this event is over.') data['error'] = ugettext('The presale period for this event is over.')
elif request.event.settings.presale_start_show_date: elif request.event.settings.presale_start_show_date:
data['error'] = gettext('The presale for this event will start on %(date)s at %(time)s.') % { data['error'] = ugettext('The presale for this event will start on %(date)s at %(time)s.') % {
'date': date_format(ev.presale_start.astimezone(request.event.timezone), "SHORT_DATE_FORMAT"), 'date': date_format(ev.presale_start.astimezone(request.event.timezone), "SHORT_DATE_FORMAT"),
'time': date_format(ev.presale_start.astimezone(request.event.timezone), "TIME_FORMAT"), 'time': date_format(ev.presale_start.astimezone(request.event.timezone), "TIME_FORMAT"),
} }
else: else:
data['error'] = gettext('The presale for this event has not yet started.') data['error'] = ugettext('The presale for this event has not yet started.')
self.voucher = None self.voucher = None
if 'voucher' in request.GET: if 'voucher' in request.GET: