X-Git-Url: https://scm.cri.ensmp.fr/git/Plinn.git/blobdiff_plain/55fa8d8e6b6b1562174b12c2658dd463c9b018dc..ae75bab9028d6321710c42da338cef25c7afe576:/Products/Plinn/skins/custom_generic/join_form.py diff --git a/Products/Plinn/skins/custom_generic/join_form.py b/Products/Plinn/skins/custom_generic/join_form.py index 8e82159..3badc16 100644 --- a/Products/Plinn/skins/custom_generic/join_form.py +++ b/Products/Plinn/skins/custom_generic/join_form.py @@ -1,4 +1,4 @@ -##parameters=member_id='', given_name='', name='', member_email='', password='', confirm='', add='', ajax='' +##parameters=member_id='', given_name='', name='', member_email='', password='', confirm='', add='', came_from='', ajax='' ## from Products.CMFCore.utils import getToolByName from Products.CMFDefault.permissions import ManageUsers @@ -37,11 +37,12 @@ if add : 'name' : name, 'email': member_email}) if validate_email : - rtool.requestPasswordReset(member_id, initial=True) + rtool.requestPasswordReset(member_id, initial=True, came_from=came_from) context.setStatus(True, _('Success!')) is_newmember = True is_anon = False except ValueError, errmsg: + raise context.setStatus(False, errmsg) options = {} @@ -58,6 +59,7 @@ options['isOrdinaryMember'] = not (mtool.isAnonymousUser() or is_newmember) options['validate_email'] = validate_email options['isAnonRegistration'] = rtool.getMode() == MODE_ANONYMOUS options['isReviewedRegistration'] = rtool.getMode() == MODE_REVIEWED +options['came_from'] = came_from buttons = [] if is_newmember: