From a2a88cfafa9f3578d64db1c7162c612bfb034ca7 Mon Sep 17 00:00:00 2001
From: Raphael Michel <mail@raphaelmichel.de>
Date: Mon, 4 Sep 2017 22:09:30 +0200
Subject: [PATCH] Fix tests after meta-data merge

---
 src/pretix/control/middleware.py  | 4 ++--
 src/pretix/control/views/event.py | 9 ++++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/pretix/control/middleware.py b/src/pretix/control/middleware.py
index c1b5caa20..43aa23de1 100644
--- a/src/pretix/control/middleware.py
+++ b/src/pretix/control/middleware.py
@@ -64,8 +64,8 @@ class PermissionMiddleware(MiddlewareMixin):
             return self._login_redirect(request)
 
         if not settings.PRETIX_LONG_SESSIONS or not request.session.get('pretix_auth_long_session', False):
-            last_used = request.session.get('pretix_auth_last_used', 0) or time.time()
-            if time.time() - request.session.get('pretix_auth_login_time', 0) > settings.PRETIX_SESSION_TIMEOUT_ABSOLUTE:
+            last_used = request.session.get('pretix_auth_last_used', time.time())
+            if time.time() - request.session.get('pretix_auth_login_time', time.time()) > settings.PRETIX_SESSION_TIMEOUT_ABSOLUTE:
                 logout(request)
                 request.session['pretix_auth_login_time'] = 0
                 return self._login_redirect(request)
diff --git a/src/pretix/control/views/event.py b/src/pretix/control/views/event.py
index 584ebacff..7284cbf42 100644
--- a/src/pretix/control/views/event.py
+++ b/src/pretix/control/views/event.py
@@ -51,9 +51,12 @@ class MetaDataEditorMixin:
 
     @cached_property
     def meta_forms(self):
-        val_instances = {
-            v.property_id: v for v in self.object.meta_values.all()
-        }
+        if hasattr(self, 'object') and self.object:
+            val_instances = {
+                v.property_id: v for v in self.object.meta_values.all()
+            }
+        else:
+            val_instances = {}
 
         formlist = []