X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fregistrationview.py;h=26f9e67dcd45e64b951b711d93684d096c988fd3;hb=95684c90f87b0bad6c435ca398f9d50c4b9373e9;hp=08d67298330e067f6889917568373c8a0297356b;hpb=d36bad9f19a0187f44568eace72630224f7162e6;p=unfold.git

diff --git a/portal/registrationview.py b/portal/registrationview.py
index 08d67298..26f9e67d 100644
--- a/portal/registrationview.py
+++ b/portal/registrationview.py
@@ -46,7 +46,8 @@ class RegistrationView (FreeAccessView):
             print "FIREXP ENABLED"
 
         authorities = execute_admin_query(request, authorities_query)
-        authorities = sorted(authorities)
+        if authorities is not None:
+            authorities = sorted(authorities)
         # xxx tocheck - if authorities is empty, it's no use anyway
         # (users won't be able to validate the form anyway)
 
@@ -107,7 +108,7 @@ class RegistrationView (FreeAccessView):
 #                private_key = ''.join(private_key.split())
 #                public_key = "ssh-rsa " + public_key
                 # Saving to DB
-                keypair = '{"user_public_key":'+ public_key + ', "user_private_key":'+ private_key + ', "user_hrn":"'+ user_hrn + '"}'
+                account_config = '{"user_public_key":'+ public_key + ', "user_private_key":'+ private_key + ', "user_hrn":"'+ user_hrn + '"}'
                 auth_type = 'managed'
                 #keypair = re.sub("\r", "", keypair)
                 #keypair = re.sub("\n", "\\n", keypair)
@@ -122,10 +123,10 @@ class RegistrationView (FreeAccessView):
                 file_extension = os.path.splitext(file_name)[1]
                 allowed_extension =  ['.pub','.txt']
                 if file_extension in allowed_extension and re.search(r'ssh-rsa',file_content):
-                    keypair = '{"user_public_key":"'+ file_content + '", "user_hrn":"'+ user_hrn +'"}'
-                    keypair = re.sub("\r", "", keypair)
-                    keypair = re.sub("\n", "\\n",keypair)
-                    keypair = ''.join(keypair.split())
+                    account_config = '{"user_public_key":"'+ file_content + '", "user_hrn":"'+ user_hrn +'"}'
+                    account_config = re.sub("\r", "", account_config)
+                    account_config = re.sub("\n", "\\n",account_config)
+                    account_config = ''.join(account_config.split())
                     auth_type = 'user'
                     # for sending email
                     public_key = file_content
@@ -146,19 +147,19 @@ class RegistrationView (FreeAccessView):
                     #login         = reg_login,
                     email         = reg_email, 
                     password      = request.POST['password'],
-                    keypair       = keypair,
+                    keypair       = account_config,
                 )
                 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}
+                user_config = '{"firstname":"'+ reg_fname + '", "lastname":"'+ reg_lname + '", "authority":"'+ reg_auth + '"}'
+                user_params = {'email': reg_email, 'password': request.POST['password'], 'config': user_config}
                 manifold_add_user(request,user_params)
                 #creating local:account in manifold
                 user_id = user_detail['user_id']+1 # the user_id for the newly created user in local:user
-                user_params = {'platform_id': 5, 'user_id': user_id, 'auth_type': auth_type, 'config': keypair}
-                manifold_add_account(request,user_params)
+                account_params = {'platform_id': 5, 'user_id': user_id, 'auth_type': auth_type, 'config': account_config}
+                manifold_add_account(request,account_params)
  
                 # Send email
                 ctx = {
@@ -168,12 +169,13 @@ class RegistrationView (FreeAccessView):
                     'email'         : reg_email,
                     'user_hrn'      : user_hrn,
                     'public_key'    : public_key,
-                    'cc_myself'     : True # form.cleaned_data['cc_myself']
                     }
                 recipients = authority_get_pi_emails(request,reg_auth)
-
-                if ctx['cc_myself']:
-                    recipients.append(ctx['email'])
+                
+                # We don't need to send this email to user.
+                # it's for the PI only
+                #if ctx['cc_myself']:
+                #    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, 'support@myslice.info', recipients)