X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fregistrationview.py;h=e0a1ddf3ee3503e47f590271b0fd0ad8fa016945;hb=7e8b243ba01f6ee786c44cf71a01963f936f67ea;hp=4e3b04058b830779586bb3a03148e0fb6f9907ef;hpb=061268fd3e0580f0a5bb098e77da3cccfb68ef3c;p=unfold.git diff --git a/portal/registrationview.py b/portal/registrationview.py index 4e3b0405..e0a1ddf3 100644 --- a/portal/registrationview.py +++ b/portal/registrationview.py @@ -37,7 +37,7 @@ class RegistrationView (FreeAccessView, ThemeView): """ """ errors = [] - + authority_hrn = None authorities_query = Query.get('authority').select('name', 'authority_hrn') authorities = execute_admin_query(wsgi_request, authorities_query) if authorities is not None: @@ -62,7 +62,7 @@ class RegistrationView (FreeAccessView, ThemeView): authority_hrn = authority['authority_hrn'] # Handle the case when the template uses only hrn and not name - if not authority_hrn: + if authority_hrn is None: authority_hrn = wsgi_request.POST.get('org_name', '') post_email = wsgi_request.POST.get('email','').lower() @@ -85,6 +85,8 @@ class RegistrationView (FreeAccessView, ThemeView): # Construct user_hrn from email (XXX Should use common code) split_email = user_request['email'].split("@")[0] split_email = split_email.replace(".", "_") + # Replace + by _ => more convenient for testing and validate with a real email + split_email = split_email.replace("+", "_") user_request['user_hrn'] = user_request['authority_hrn'] \ + '.' + split_email @@ -120,6 +122,8 @@ class RegistrationView (FreeAccessView, ThemeView): + '.' + split_email + str(randint(1,1000000)) # XXX TODO: Factorize with portal/accountview.py + # XXX TODO: Factorize with portal/registrationview.py + # XXX TODO: Factorize with portal/joinview.py if 'generate' in wsgi_request.POST['question']: user_request['auth_type'] = 'managed'