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

[myslice.git] / portal / registrationview.py

diff --git a/portal/registrationview.py b/portal/registrationview.py
index d5d3b97..c54bcab 100644 (file)
--- 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 #################"