"""
"""
errors = []
-
+ authority_hrn = None
authorities_query = Query.get('authority').select('name', 'authority_hrn')
authorities = execute_admin_query(wsgi_request, authorities_query)
if authorities is not None:
# Page rendering
page = Page(wsgi_request)
- page.add_js_files ( [ "js/jquery.validate.js", "js/my_account.register.js", "js/jquery.qtip.min.js", "js/jquery-ui.js" ] )
+ page.add_js_files ( [ "js/jquery.validate.js", "js/my_account.register.js", "js/jquery.qtip.min.js","js/jquery-ui.js" ] )
page.add_css_files ( [ "css/onelab.css", "css/registration.css", "css/jquery.qtip.min.css" ] )
page.add_css_files ( [ "https://code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css" ] )
current_site = Site.objects.get_current()
current_site = current_site.domain
- authorities_query = Query.get('authority').select('name', 'authority_hrn')
- authorities = execute_admin_query(wsgi_request, authorities_query)
-
for authority in authorities:
if authority['name'] == wsgi_request.POST.get('org_name', ''):
authority_hrn = authority['authority_hrn']
+ # Handle the case when the template uses only hrn and not name
+ if authority_hrn is None:
+ authority_hrn = wsgi_request.POST.get('org_name', '')
+
post_email = wsgi_request.POST.get('email','').lower()
salt = randint(1,100000)
email_hash = md5(str(salt)+post_email).hexdigest()
'password' : wsgi_request.POST.get('password', ''),
'current_site' : current_site,
'email_hash' : email_hash,
+ 'pi' : '',
'validation_link': 'http://' + current_site + '/portal/email_activation/'+ email_hash
}
# Validate input
UserModel = get_user_model()
if (re.search(r'^[\w+\s.@+-]+$', user_request['first_name']) == None):
- errors.append('First Name may contain only letters, numbers, spaces and @/./+/-/_ characters.')
+ errors.append('First name may contain only letters, numbers, spaces and @/./+/-/_ characters.')
if (re.search(r'^[\w+\s.@+-]+$', user_request['last_name']) == None):
- errors.append('Last Name may contain only letters, numbers, spaces and @/./+/-/_ characters.')
+ errors.append('Last name may contain only letters, numbers, spaces and @/./+/-/_ characters.')
# checking in django_db !!
if PendingUser.objects.filter(email__iexact = user_request['email']):
errors.append('Email is pending for validation. Please provide a new email address.')
ALLOWED_EXTENSIONS = ['.pub','.txt']
if file_extension not in ALLOWED_EXTENSIONS or not re.search(r'ssh-rsa',file_content):
errors.append('Please upload a valid RSA public key.')
-
- user_request['private_key'] = None
+ # user_request['private_key'] can't be Null because all db fields are set as NOT NULL
+ user_request['private_key'] = ""
user_request['public_key'] = file_content
if not errors: