REG: BUG FIX

diff --git a/portal/registrationview.py b/portal/registrationview.py
index b9f35ff..f28ccb7 100644 (file)
--- a/portal/registrationview.py
+++ b/portal/registrationview.py
@@ -34,16 +34,16 @@ class RegistrationView (FreeAccessView):
         #authorities_query = Query.get('authority').\
         #    select('name', 'authority_hrn')
         
         #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:
         #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'])
-        #else:
-        #    print "FIREXP 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'])
+        else:
+            print "FIREXP ENABLED"

 
 

-        #authorities = execute_admin_query(request, authorities_query)
+        authorities = execute_admin_query(request, authorities_query)

         # xxx tocheck - if authorities is empty, it's no use anyway
         # (users won't be able to validate the form anyway)
 
         # xxx tocheck - if authorities is empty, it's no use anyway
         # (users won't be able to validate the form anyway)
 


@@ -53,6 +53,9 @@ class RegistrationView (FreeAccessView):
 
         print 'registration view, method',method
 
 
         print 'registration view, method',method
 

+        user_query  = Query().get('local:user').select('user_id','email')
+        user_details = execute_admin_query(self.request, user_query)
+

         if method == 'POST':
             # We shall use a form here
 
         if method == 'POST':
             # We shall use a form here
 


@@ -75,7 +78,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('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 already registered.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.')

 
 # XXX TODO: Factorize with portal/accountview.py
             if 'generate' in request.POST['question']:
 
 # XXX TODO: Factorize with portal/accountview.py
             if 'generate' in request.POST['question']:


@@ -154,20 +160,16 @@ 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)
 
                 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
-            user_query  = Query().get('local:user').select('user_id','email')
-            user_details = execute_admin_query(self.request, user_query)
+                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']
             for user_detail in user_details:
                 if user_detail['email']==reg_email:
                     user_id = user_detail['user_id']

-                    #print "test"
-                    #print user_id
+                    

             user_params = {'platform_id': 5, 'user_id': user_id, 'auth_type': auth_type, 'config': keypair}    
             manifold_add_account(request,user_params)
             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),
 
         template_env = {
           'topmenu_items': topmenu_items('Register', request),


@@ -178,7 +180,7 @@ class RegistrationView (FreeAccessView):
           'authority_hrn': request.POST.get('authority_hrn', ''),
           'email': request.POST.get('email', ''),
           'password': request.POST.get('password', ''),           
           'authority_hrn': request.POST.get('authority_hrn', ''),
           'email': request.POST.get('email', ''),
           'password': request.POST.get('password', ''),           

-          #'authorities': authorities,
+          'authorities': authorities,

           }
         template_env.update(page.prelude_env ())
         return render(request, 'registration_view.html',template_env)
           }
         template_env.update(page.prelude_env ())
         return render(request, 'registration_view.html',template_env)