X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fregistrationview.py;h=102e60099f58c8d43399cc87ab27dcc152db98c2;hb=f67ade2d281f726dfaf084dee293393721fce8d9;hp=d5d3b972f2da7ca69b90c9cd30c59bd7c710b002;hpb=2b383a5e10af59f34dc309bb1d7638205b801f01;p=unfold.git diff --git a/portal/registrationview.py b/portal/registrationview.py index d5d3b972..102e6009 100644 --- a/portal/registrationview.py +++ b/portal/registrationview.py @@ -44,8 +44,12 @@ class RegistrationView (FreeAccessView, ThemeView): # REGISTRY ONLY TO BE REMOVED WITH MANIFOLD-V2 authorities_query = Query.get('authority').select('name', 'authority_hrn') authorities = execute_admin_query(wsgi_request, authorities_query) + print "RegistrationView authorities = ", authorities if authorities is not None: - authorities = sorted(authorities, key=lambda k: k['name']) + # Remove the root authority from the list + matching = [s for s in authorities if "." in s['authority_hrn']] + authorities = sorted(matching, key=lambda k: k['authority_hrn']) + authorities = sorted(matching, key=lambda k: k['name']) print "############ BREAKPOINT 1 #################" # Page rendering @@ -80,7 +84,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': current_site + '/portal/email_activation/'+ email_hash } print "############ BREAKPOINT 4 #################"