From: Loic Baron Date: Tue, 14 Jan 2014 09:56:13 +0000 (+0100) Subject: Registration autocomplete for authorities X-Git-Tag: myslice-0.3-0~37 X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=5d6232c324cc1baa1117854ff498c910994e4bfd Registration autocomplete for authorities --- diff --git a/myslice/settings.py b/myslice/settings.py index f3bdb7b4..4f655385 100644 --- a/myslice/settings.py +++ b/myslice/settings.py @@ -61,13 +61,13 @@ EMAIL_USE_TLS = False # turn on debugging: # python -m smtpd -n -c DebuggingServer localhost:1025 -if DEBUG: - EMAIL_HOST = 'localhost' - EMAIL_PORT = 1025 - EMAIL_HOST_USER = '' - EMAIL_HOST_PASSWORD = '' - EMAIL_USE_TLS = False - DEFAULT_FROM_EMAIL = 'testing@example.com' +#if DEBUG: +# EMAIL_HOST = 'localhost' +# EMAIL_PORT = 1025 +# EMAIL_HOST_USER = '' +# EMAIL_HOST_PASSWORD = '' +# EMAIL_USE_TLS = False +# DEFAULT_FROM_EMAIL = 'testing@example.com' DATABASES = { 'default': { diff --git a/portal/registrationview.py b/portal/registrationview.py index 62c09347..05b117b4 100644 --- a/portal/registrationview.py +++ b/portal/registrationview.py @@ -67,7 +67,7 @@ class RegistrationView (FreeAccessView): reg_lname = request.POST.get('lastname', '') #reg_aff = request.POST.get('affiliation','') reg_auth = request.POST.get('authority_hrn', '') - reg_login = request.POST.get('login', '') + #reg_login = request.POST.get('login', '') reg_email = request.POST.get('email','').lower() #prepare user_hrn split_email = reg_email.split("@")[0] @@ -138,7 +138,7 @@ class RegistrationView (FreeAccessView): last_name = reg_lname, #affiliation = reg_aff, authority_hrn = reg_auth, - login = reg_login, + #login = reg_login, email = reg_email, password = request.POST['password'], keypair = keypair, diff --git a/portal/templates/registration_view.html b/portal/templates/registration_view.html index 450575d2..5ce34592 100644 --- a/portal/templates/registration_view.html +++ b/portal/templates/registration_view.html @@ -37,7 +37,7 @@
- +

An authority responsible for vetting your account

@@ -47,7 +47,6 @@ TODO: Login should be suggested from user email or first/last name, and checked for existence. In addition, the full HRN should be shown to the user. - -->
@@ -55,7 +54,8 @@

Enter your login

- + --> +