X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fregistrationview.py;h=8f91de79cbbc5bf0a3c4eb1d2944635bd025da2b;hb=960addc41d03da7286ded7fc20ad3d87ac9c2771;hp=f28ccb7f405335e6b1b2ffdc8feeaf72c5f0b544;hpb=fa59e186d66333cb2471e3bf5af347fa72ed0883;p=myslice.git

diff --git a/portal/registrationview.py b/portal/registrationview.py
index f28ccb7f..8f91de79 100644
--- a/portal/registrationview.py
+++ b/portal/registrationview.py
@@ -31,15 +31,16 @@ class RegistrationView (FreeAccessView):
     def get_or_post  (self, request, method):
         errors = []
 
-        #authorities_query = Query.get('authority').\
-        #    select('name', 'authority_hrn')
+        # Using cache manifold-tables to get the list of authorities faster
+        authorities_query = Query.get('authority').select('name', 'authority_hrn')
         
-        onelab_enabled_query = Query.get('local:platform').filter_by('platform', '==', 'ple').filter_by('disabled', '==', 'False')
+        #onelab_enabled_query = Query.get('local:platform').filter_by('platform', '==', 'ple').filter_by('disabled', '==', 'False')
         #onelab_enabled = not not execute_admin_query(request, onelab_enabled_query)
         #if onelab_enabled:
         if True:
             print "ONELAB ENABLED"
-            authorities_query = Query.get('ple:authority').select('name', 'authority_hrn').filter_by('authority_hrn', 'included', ['ple.inria', 'ple.upmc', 'ple.ibbtple', 'ple.nitos'])
+            #authorities_query = Query.get('ple:authority').select('name', 'authority_hrn').filter_by('authority_hrn', 'included', ['ple.inria', 'ple.upmc', 'ple.ibbtple', 'ple.nitos'])
+            # Now using Cache 
         else:
             print "FIREXP ENABLED"
 
@@ -78,10 +79,10 @@ class RegistrationView (FreeAccessView):
                 errors.append('Last Name may contain only letters, numbers, spaces and @/./+/-/_ characters.')
             # XXX validate authority hrn !!
             if PendingUser.objects.filter(email__iexact=reg_email):
-                errors.append('Email is pending for validation.Please provide a new email address.')
+                errors.append('Email is pending for validation. Please provide a new email address.')
             for user_detail in user_details:
                 if user_detail['email']==reg_email:
-                    errors.append('Email already exists in Manifold.Please provide a new email address.')
+                    errors.append('Email already exists in Manifold. Please provide a new email address.')
 
 # XXX TODO: Factorize with portal/accountview.py
             if 'generate' in request.POST['question']:
@@ -138,10 +139,15 @@ class RegistrationView (FreeAccessView):
                     keypair       = keypair,
                 )
                 b.save()
-                #saving to manifold
-                config = '{"firstname":'+ reg_fname + ', "lastname":'+ reg_lname + ', "authority":"'+ reg_auth + '"}'
+                #creating user to manifold local:user
+                config = '{"firstname":"'+ reg_fname + '", "lastname":"'+ reg_lname + '", "authority":"'+ reg_auth + '"}'
                 user_params = {'email': reg_email, 'password': request.POST['password'], 'config': config}
-                manifold_add_user(request,user_params) 
+                manifold_add_user(request,user_params)
+                #creating local:account in manifold
+                user_id = user_detail['user_id']+1 # the user_id for the newly created user in local:user
+                user_params = {'platform_id': 5, 'user_id': user_id, 'auth_type': auth_type, 'config': keypair}
+                manifold_add_account(request,user_params)
+ 
                 # Send email
                 ctx = {
                     'first_name'    : reg_fname, 
@@ -159,17 +165,7 @@ class RegistrationView (FreeAccessView):
 
                 msg = render_to_string('user_request_email.txt', ctx)
                 send_mail("Onelab New User request for %s submitted"%reg_email, msg, reg_email, recipients)
-
-                return render(request, 'user_register_complete.html')
-            
-        #creating local:account in manifold
-            for user_detail in user_details:
-                if user_detail['email']==reg_email:
-                    user_id = user_detail['user_id']
-                    
-            user_params = {'platform_id': 5, 'user_id': user_id, 'auth_type': auth_type, 'config': keypair}    
-            manifold_add_account(request,user_params)
-        #        return render(request, 'user_register_complete.html') 
+                return render(request, 'user_register_complete.html') 
 
         template_env = {
           'topmenu_items': topmenu_items('Register', request),