Scheduler: adding/removing resources enforce warnings and recount number of unconfigu...

[myslice.git] / portal / emailactivationview.py

diff --git a/portal/emailactivationview.py b/portal/emailactivationview.py
index b7f9cd5..4424c2e 100644 (file)
--- a/portal/emailactivationview.py
+++ b/portal/emailactivationview.py
@@ -29,12 +29,16 @@ class ActivateEmailView(FreeAccessView, ThemeView):
         if pending_authorities:
             return False                        
         pending_user_email = pending_user.email
-        query = Query.get('myplcuser').filter_by('email', '==', pending_user_email).select('enabled')
-        results = execute_admin_query(self.request, query)
-        for result in results:
-            # User is enabled in PLE
-            if 'enabled' in result and result['enabled']==True:
-                return True
+        try:
+            query = Query.get('myplcuser').filter_by('email', '==', pending_user_email).select('enabled')
+            results = execute_admin_query(self.request, query)
+            for result in results:
+                # User is enabled in PLE
+                if 'enabled' in result and result['enabled']==True:
+                    return True
+        except Exception, e:
+            print "Exception in myplc query = ",e
+
         return False
 
     def dispatch(self, *args, **kwargs):
@@ -74,7 +78,7 @@ class ActivateEmailView(FreeAccessView, ThemeView):
                         # Create user in SFA and Update in Manifold
                         create_user(self.request, pending_user_request, namespace = 'myslice', as_admin = True)
                         # Delete pending user
-                        #PendingUser.objects.filter(email_hash__iexact = hash_code).delete()
+                        PendingUser.objects.filter(email_hash__iexact = hash_code).delete()
 
                         # template user auto validated
                         activation = 'validated'