diff --git a/src/pretix/presale/middleware.py b/src/pretix/presale/middleware.py index 48d2e18738..14dfcc9164 100644 --- a/src/pretix/presale/middleware.py +++ b/src/pretix/presale/middleware.py @@ -55,7 +55,7 @@ class EventMiddleware: path = request.get_full_path().split("/", 2)[-1] return redirect(urljoin('%s://%s' % (request.scheme, domain), path)) - if not request.event.live: + if hasattr(request, 'event') and not request.event.live: if not request.user.is_authenticated() or not EventPermission.objects.filter( event=request.event, user=request.user).exists(): raise PermissionDenied(_('The selected ticket shop is currently not available.')) diff --git a/src/tests/base/test_middleware.py b/src/tests/base/test_middleware.py index e1519f2a2e..afa7a777d3 100644 --- a/src/tests/base/test_middleware.py +++ b/src/tests/base/test_middleware.py @@ -15,7 +15,7 @@ class LocaleDeterminationTest(TestCase): o = Organizer.objects.create(name='Dummy', slug='dummy') cls.event = Event.objects.create( organizer=o, name='Dummy', slug='dummy', - date_from=now(), + date_from=now(), live=True ) cls.TEST_LOCALE = 'de' if settings.LANGUAGE_CODE == 'en' else 'en' cls.TEST_LOCALE_LONG = 'de-AT' if settings.LANGUAGE_CODE == 'en' else 'en-NZ' diff --git a/src/tests/multidomain/test_middlewares.py b/src/tests/multidomain/test_middlewares.py index f4b1b8252f..859b9b9c75 100644 --- a/src/tests/multidomain/test_middlewares.py +++ b/src/tests/multidomain/test_middlewares.py @@ -13,7 +13,7 @@ def env(): o = Organizer.objects.create(name='MRMCD', slug='mrmcd') event = Event.objects.create( organizer=o, name='MRMCD2015', slug='2015', - date_from=now() + date_from=now(), live=True ) settings.SITE_URL = 'http://example.com' return o, event @@ -61,7 +61,7 @@ def test_event_on_custom_domain_only_with_wrong_organizer(env, client): organizer2 = Organizer.objects.create(name='Dummy', slug='dummy') Event.objects.create( organizer=organizer2, name='D1234', slug='1234', - date_from=now() + date_from=now(), live=True ) KnownDomain.objects.create(domainname='foobar', organizer=env[0]) r = client.get('/dummy/1234/', HTTP_HOST='foobar') @@ -73,7 +73,7 @@ def test_unknown_event_on_custom_domain(env, client): organizer2 = Organizer.objects.create(name='Dummy', slug='dummy') Event.objects.create( organizer=organizer2, name='D1234', slug='1234', - date_from=now() + date_from=now(), live=True ) KnownDomain.objects.create(domainname='foobar', organizer=env[0]) r = client.get('/1234/', HTTP_HOST='foobar') diff --git a/src/tests/presale/test_cart.py b/src/tests/presale/test_cart.py index 4d5046859d..fed198e827 100644 --- a/src/tests/presale/test_cart.py +++ b/src/tests/presale/test_cart.py @@ -18,7 +18,8 @@ class CartTestMixin: self.orga = Organizer.objects.create(name='CCC', slug='ccc') self.event = Event.objects.create( organizer=self.orga, name='30C3', slug='30c3', - date_from=datetime.datetime(2013, 12, 26, tzinfo=datetime.timezone.utc) + date_from=datetime.datetime(2013, 12, 26, tzinfo=datetime.timezone.utc), + live=True ) self.category = ItemCategory.objects.create(event=self.event, name="Everything", position=0) self.quota_shirts = Quota.objects.create(event=self.event, name='Shirts', size=2) diff --git a/src/tests/presale/test_checkout.py b/src/tests/presale/test_checkout.py index d34a0837ee..6e69ec3f33 100644 --- a/src/tests/presale/test_checkout.py +++ b/src/tests/presale/test_checkout.py @@ -19,7 +19,8 @@ class CheckoutTestCase(TestCase): self.event = Event.objects.create( organizer=self.orga, name='30C3', slug='30c3', date_from=datetime.datetime(2013, 12, 26, tzinfo=datetime.timezone.utc), - plugins='pretix.plugins.stripe,pretix.plugins.banktransfer' + plugins='pretix.plugins.stripe,pretix.plugins.banktransfer', + live=True ) self.category = ItemCategory.objects.create(event=self.event, name="Everything", position=0) self.quota_tickets = Quota.objects.create(event=self.event, name='Tickets', size=5) diff --git a/src/tests/presale/test_checkoutflow.py b/src/tests/presale/test_checkoutflow.py index bfafa91045..78da12cf79 100644 --- a/src/tests/presale/test_checkoutflow.py +++ b/src/tests/presale/test_checkoutflow.py @@ -12,7 +12,7 @@ def event(): o = Organizer.objects.create(name='MRMCD', slug='mrmcd') e = Event.objects.create( organizer=o, name='MRMCD2015', slug='2015', - date_from=now() + date_from=now(), live=True ) return e diff --git a/src/tests/presale/test_event.py b/src/tests/presale/test_event.py index 2886b39f0e..4192baa7b8 100644 --- a/src/tests/presale/test_event.py +++ b/src/tests/presale/test_event.py @@ -17,6 +17,7 @@ class EventTestMixin: self.event = Event.objects.create( organizer=self.orga, name='30C3', slug='30c3', date_from=datetime.datetime(2013, 12, 26, tzinfo=datetime.timezone.utc), + live=True ) diff --git a/src/tests/presale/test_orders.py b/src/tests/presale/test_orders.py index 8235b61e7d..52d74bb054 100644 --- a/src/tests/presale/test_orders.py +++ b/src/tests/presale/test_orders.py @@ -18,7 +18,8 @@ class OrdersTest(TestCase): self.event = Event.objects.create( organizer=self.orga, name='30C3', slug='30c3', date_from=datetime.datetime(2013, 12, 26, tzinfo=datetime.timezone.utc), - plugins='pretix.plugins.stripe,pretix.plugins.banktransfer,tests.testdummy' + plugins='pretix.plugins.stripe,pretix.plugins.banktransfer,tests.testdummy', + live=True ) self.event.settings.set('payment_banktransfer__enabled', True) self.event.settings.set('ticketoutput_testdummy__enabled', True) diff --git a/src/tests/presale/test_organizer_page.py b/src/tests/presale/test_organizer_page.py index ce9884ed87..74f3201360 100644 --- a/src/tests/presale/test_organizer_page.py +++ b/src/tests/presale/test_organizer_page.py @@ -11,7 +11,8 @@ def env(): o = Organizer.objects.create(name='MRMCD e.V.', slug='mrmcd') event = Event.objects.create( organizer=o, name='MRMCD2015', slug='2015', - date_from=now() + timedelta(days=10) + date_from=now() + timedelta(days=10), + live=True ) return o, event