X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fregistrationview.py;h=c54bcab2db7685df3f5a3718c548df77cd9a155f;hb=111d0fcb9681bf94ff184fe43bf636b6d672cbff;hp=a1deeada2532dce92837fc44155121a7d8310662;hpb=faa0a79d66fb03285cb8ad4ea376543822ae1636;p=unfold.git
diff --git a/portal/registrationview.py b/portal/registrationview.py
index a1deeada..c54bcab2 100644
--- a/portal/registrationview.py
+++ b/portal/registrationview.py
@@ -45,6 +45,7 @@ class RegistrationView (FreeAccessView, ThemeView):
authorities_query = Query.get('authority').select('name', 'authority_hrn')
authorities = execute_admin_query(wsgi_request, authorities_query)
if authorities is not None:
+ authorities = sorted(authorities, key=lambda k: k['authority_hrn'])
authorities = sorted(authorities, key=lambda k: k['name'])
print "############ BREAKPOINT 1 #################"
@@ -80,7 +81,7 @@ class RegistrationView (FreeAccessView, ThemeView):
'current_site' : current_site,
'email_hash' : email_hash,
'pi' : '',
- 'validation_link': 'http://' + current_site + '/portal/email_activation/'+ email_hash
+ 'validation_link': 'https://' + current_site + '/portal/email_activation/'+ email_hash
}
print "############ BREAKPOINT 4 #################"
@@ -138,7 +139,7 @@ class RegistrationView (FreeAccessView, ThemeView):
# sqlite3 /var/unfold/unfold.sqlite3
# select email from auth_user;
if UserModel._default_manager.filter(email__iexact = user_request['email']):
- errors.append('Contact OneLab support or try with another email.')
+ errors.append('Contact support or try with another email.')
# XXX TODO: Factorize with portal/accountview.py
# XXX TODO: Factorize with portal/registrationview.py