Merge branch 'master' of ssh://git.onelab.eu/git/myslice
authorLoic Baron <loic.baron@lip6.fr>
Tue, 14 Jan 2014 09:56:45 +0000 (10:56 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Tue, 14 Jan 2014 09:56:45 +0000 (10:56 +0100)
1  2 
portal/registrationview.py

@@@ -67,7 -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] 
                      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_fname, reg_email, request.POST['password'])
+                 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}