Merge branch 'master' of ssh://git.onelab.eu/git/myslice

[myslice.git] / portal / registrationview.py

diff --git a/portal/registrationview.py b/portal/registrationview.py
index 26f9e67..90893f7 100644 (file)
--- a/portal/registrationview.py
+++ b/portal/registrationview.py
@@ -1,5 +1,6 @@
 import os.path, re
 import json
+from random import randint
 
 from django.core.mail           import send_mail
 from django.contrib.auth.models import User
@@ -74,7 +75,7 @@ class RegistrationView (FreeAccessView):
             #prepare user_hrn 
             split_email = reg_email.split("@")[0] 
             split_email = split_email.replace(".", "_")
-            user_hrn = reg_auth + '.' + split_email
+            user_hrn = reg_auth + '.' + split_email+ str(randint(1,1000000))
             
             UserModel = get_user_model()
 
@@ -132,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)