X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fregistrationview.py;h=2ce1efaf70eec338dd433fa92b3b78a98f87bd00;hb=d34d504c555e2825e6da74533d856c72a2ba004a;hp=a1deeada2532dce92837fc44155121a7d8310662;hpb=ea22db0e99695ec26e1481558af65e0a541572da;p=myslice.git

diff --git a/portal/registrationview.py b/portal/registrationview.py
index a1deeada..2ce1efaf 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,12 +84,12 @@ 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 #################"
             auth = wsgi_request.POST.get('org_name', None)
-            if auth is None:
+            if auth is None or auth == "":
                 errors.append('Organization required: please select one or request its addition')
             else:
                
@@ -138,7 +142,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('<a href="/contact">Contact OneLab support</a> or try with another email.')
+                    errors.append('<a href="/contact">Contact support</a> or try with another email.')
 
                 # XXX TODO: Factorize with portal/accountview.py
                 # XXX TODO: Factorize with portal/registrationview.py