X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=blobdiff_plain;f=portal%2Fregistrationview.py;h=47c1cdce1b916ee99d5ae27568fc2204884eacfe;hp=c966b52ffb2fe69ee47e5a4020145fe062bd7ef8;hb=864c51bf4c1330e2a1a1b5978b8a8dc5afe01763;hpb=6ec04646df726a21d776ceacba5fdf780bf9876e

diff --git a/portal/registrationview.py b/portal/registrationview.py
index c966b52f..47c1cdce 100644
--- a/portal/registrationview.py
+++ b/portal/registrationview.py
@@ -133,7 +133,7 @@ class RegistrationView (FreeAccessView):
                     public_key = file_content
                     public_key = ''.join(public_key.split()) 
                 else:
-                    errors.append('Please upload a valid RSA public key [.txt or .pub].')
+                    errors.append('Please upload a valid RSA public key.')
 
             #b = PendingUser(first_name=reg_fname, last_name=reg_lname, affiliation=reg_aff, 
             #                email=reg_email, password=request.POST['password'], keypair=keypair)
@@ -149,13 +149,14 @@ class RegistrationView (FreeAccessView):
                     email         = reg_email, 
                     password      = request.POST['password'],
                     keypair       = account_config,
+                    pi            = '',
                 )
                 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
                 user_config = '{"firstname":"'+ reg_fname + '", "lastname":"'+ reg_lname + '", "authority":"'+ reg_auth + '"}'
-                user_params = {'email': reg_email, 'password': request.POST['password'], 'config': user_config}
+                user_params = {'email': reg_email, 'password': request.POST['password'], 'config': user_config, 'status': 1}
                 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
@@ -172,12 +173,9 @@ class RegistrationView (FreeAccessView):
                     'public_key'    : public_key,
                     }
                 recipients = authority_get_pi_emails(request,reg_auth)
+                # backup email: if authority_get_pi_emails fails
+                recipients.append('support@myslice.info')
                 
-                # 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)
                 return render(request, 'user_register_complete.html')