From 63daa339c4623167836ca59e82027395af668f95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Sun, 20 May 2018 23:30:18 +0200 Subject: [PATCH 1/3] misc: remove leftover code related to form invitations (#23975) --- wcs/forms/root.py | 40 +--------------------------------------- 1 file changed, 1 insertion(+), 39 deletions(-) diff --git a/wcs/forms/root.py b/wcs/forms/root.py index a6ff0a3b..8e3ad5fd 100644 --- a/wcs/forms/root.py +++ b/wcs/forms/root.py @@ -41,7 +41,6 @@ from qommon import misc, get_logger from qommon import template from qommon.form import * from qommon.logger import BotFilter -from qommon import tokens from qommon import emails from wcs.categories import Category @@ -98,42 +97,6 @@ def auth(url): return redirect(login_url) -class TokenDirectory(Directory): - _q_exports = [''] - - def __init__(self, formdef, token): - self.formdef = formdef - self.token = token - - def _q_index(self): - if self.token.type != 'form-invite': - raise errors.TraversalError() - - if self.token.formdef_id != self.formdef.id: - raise errors.TraversalError() - - try: - self.token.remove_self() - except OSError: - # race condition, and the token already got removed (??!) - self.token.type = None - - get_session().set_user(self.token.user_id) - return redirect(self.formdef.get_url()) - - -class TokensDirectory(Directory): - def __init__(self, formdef): - self.formdef = formdef - - def _q_lookup(self, component): - try: - token = tokens.Token.get(component) - except KeyError: - raise errors.TraversalError() - return TokenDirectory(self.formdef, token) - - class TrackingCodeDirectory(Directory): _q_exports = ['', 'load'] @@ -206,7 +169,7 @@ class TrackingCodesDirectory(Directory): return TrackingCodeDirectory(component, self.formdef) class FormPage(Directory, FormTemplateMixin): - _q_exports = ['', 'tempfile', 'tokens', 'schema', 'tryauth', + _q_exports = ['', 'tempfile', 'schema', 'tryauth', 'auth', 'qrcode', 'autosave', 'code', 'removedraft'] filling_templates = ['wcs/front/formdata_filling.html', 'wcs/formdata_filling.html'] @@ -222,7 +185,6 @@ class FormPage(Directory, FormTemplateMixin): get_publisher().substitutions.feed(self) get_publisher().substitutions.feed(self.formdef) - self.tokens = TokensDirectory(self.formdef) self.code = TrackingCodesDirectory(self.formdef) self.action_url = '.' self.edit_mode = False -- 2.17.0