CGM_Public/pretix_cgo
1
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions Activity

Fix tests after meta-data merge

Browse Source
This commit is contained in:
Raphael Michel
2017-09-04 22:09:30 +02:00
parent 5ff53d08ed
commit a2a88cfafa
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/pretix/control/middleware.py
View File

@@ -64,8 +64,8 @@ class PermissionMiddleware(MiddlewareMixin):
return self._login_redirect(request) return self._login_redirect(request)
if not settings.PRETIX_LONG_SESSIONS or not request.session.get('pretix_auth_long_session', False): 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() last_used = request.session.get('pretix_auth_last_used', time.time())
if time.time() - request.session.get('pretix_auth_login_time', 0) > settings.PRETIX_SESSION_TIMEOUT_ABSOLUTE: if time.time() - request.session.get('pretix_auth_login_time', time.time()) > settings.PRETIX_SESSION_TIMEOUT_ABSOLUTE:
logout(request) logout(request)
request.session['pretix_auth_login_time'] = 0 request.session['pretix_auth_login_time'] = 0
return self._login_redirect(request) return self._login_redirect(request)

9
src/pretix/control/views/event.py
View File

@@ -51,9 +51,12 @@ class MetaDataEditorMixin:
@cached_property @cached_property
def meta_forms(self): def meta_forms(self):
val_instances = { if hasattr(self, 'object') and self.object:
v.property_id: v for v in self.object.meta_values.all() val_instances = {
} v.property_id: v for v in self.object.meta_values.all()
}
else:
val_instances = {}
formlist = [] formlist = []