X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fregistrationview.py;h=08d67298330e067f6889917568373c8a0297356b;hb=1e68ec413db233604adef3e84d5bc94ef30cd9f9;hp=e85f7d5165491a3edf4654acc17dd11833ea4748;hpb=1f4552214795c19b8881c93a9b871a50c8e12056;p=myslice.git

diff --git a/portal/registrationview.py b/portal/registrationview.py
index e85f7d51..08d67298 100644
--- a/portal/registrationview.py
+++ b/portal/registrationview.py
@@ -2,10 +2,11 @@ import os.path, re
 import json
 
 from django.core.mail           import send_mail
-
+from django.contrib.auth.models import User
 from django.views.generic       import View
 from django.template.loader     import render_to_string
 from django.shortcuts           import render
+from django.contrib.auth        import get_user_model
 
 from unfold.page                import Page
 from unfold.loginrequired       import FreeAccessView
@@ -45,12 +46,14 @@ class RegistrationView (FreeAccessView):
             print "FIREXP ENABLED"
 
         authorities = execute_admin_query(request, authorities_query)
+        authorities = sorted(authorities)
         # xxx tocheck - if authorities is empty, it's no use anyway
         # (users won't be able to validate the form anyway)
 
         page = Page(request)
         page.add_js_files  ( [ "js/jquery.validate.js", "js/my_account.register.js" ] )
         page.add_css_files ( [ "css/onelab.css", "css/registration.css" ] )
+        page.add_css_files ( [ "http://code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css" ] )
 
         print 'registration view, method',method
 
@@ -65,24 +68,28 @@ 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] 
             split_email = split_email.replace(".", "_")
             user_hrn = reg_auth + '.' + split_email
+            
+            UserModel = get_user_model()
 
             #POST value validation  
             if (re.search(r'^[\w+\s.@+-]+$', reg_fname)==None):
                 errors.append('First Name may contain only letters, numbers, spaces and @/./+/-/_ characters.')
             if (re.search(r'^[\w+\s.@+-]+$', reg_lname) == None):
                 errors.append('Last Name may contain only letters, numbers, spaces and @/./+/-/_ characters.')
-            # XXX validate authority hrn !!
+            # checking in django_db !!
             if PendingUser.objects.filter(email__iexact=reg_email):
                 errors.append('Email is pending for validation. Please provide a new email address.')
+            if UserModel._default_manager.filter(email__iexact=reg_email): 
+                errors.append('This email is not usable. Please contact the administrator or try with another email.')
             for user_detail in user_details:
                 if user_detail['email']==reg_email:
-                    errors.append('Email already exists in Manifold. Please provide a new email address.')
+                    errors.append('Email already registered in Manifold. Please provide a new email address.')
 
 # XXX TODO: Factorize with portal/accountview.py
             if 'generate' in request.POST['question']:
@@ -136,12 +143,14 @@ 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,
                 )
                 b.save()
+                # saves the user to django auth_user table [needed for password reset]
+                user = User.objects.create_user(reg_email, reg_email, request.POST['password'])
                 #creating user to manifold local:user
                 config = '{"firstname":"'+ reg_fname + '", "lastname":"'+ reg_lname + '", "authority":"'+ reg_auth + '"}'
                 user_params = {'email': reg_email, 'password': request.POST['password'], 'config': config}
@@ -158,7 +167,7 @@ class RegistrationView (FreeAccessView):
                     'authority_hrn' : reg_auth,
                     'email'         : reg_email,
                     'user_hrn'      : user_hrn,
-                    'keypair'       : 'Public Key: ' + public_key,
+                    'public_key'    : public_key,
                     'cc_myself'     : True # form.cleaned_data['cc_myself']
                     }
                 recipients = authority_get_pi_emails(request,reg_auth)
@@ -167,7 +176,7 @@ class RegistrationView (FreeAccessView):
                     recipients.append(ctx['email'])
 
                 msg = render_to_string('user_request_email.txt', ctx)
-                send_mail("Onelab New User request for %s submitted"%reg_email, msg, reg_email, recipients)
+                send_mail("Onelab New User request for %s submitted"%reg_email, msg, 'support@myslice.info', recipients)
                 return render(request, 'user_register_complete.html') 
 
         template_env = {