X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Femailactivationview.py;h=8bb164f686d8bd2ec0d4f277a61a835085b33f93;hb=7ab4b86ad8c61b3e7119e2d54bd5cfa14dcc92f7;hp=b7f9cd54341239feb914c280f2f3390089828e08;hpb=d45b63ca0026f8feb70e6ef64dee9773b467b479;p=myslice.git

diff --git a/portal/emailactivationview.py b/portal/emailactivationview.py
index b7f9cd54..8bb164f6 100644
--- a/portal/emailactivationview.py
+++ b/portal/emailactivationview.py
@@ -1,22 +1,31 @@
-from unfold.loginrequired               import FreeAccessView
-#
-from manifold.core.query                import Query
-from manifoldapi.manifoldapi            import execute_query, execute_admin_query
-from portal.actions                     import manifold_update_user, manifold_update_account, manifold_add_account, manifold_delete_account, sfa_update_user, authority_get_pi_emails, make_request_user, create_user
-#
-from unfold.page                        import Page    
-from ui.topmenu                         import topmenu_items_live, the_user
-#
+import json
+import os
+import re
+import itertools
+
 from django.http                        import HttpResponse, HttpResponseRedirect
 from django.contrib                     import messages
 from django.contrib.auth.decorators     import login_required
-from myslice.theme                      import ThemeView
-from portal.models                      import PendingUser, PendingAuthority
 from django.core.mail                   import EmailMultiAlternatives, send_mail
 from django.contrib.sites.models        import Site
 
-#
-import json, os, re, itertools
+from manifold.core.query                import Query
+from manifoldapi.manifoldapi            import execute_query, execute_admin_query
+
+from unfold.loginrequired               import FreeAccessView
+
+from portal.actions                     import (
+    manifold_update_user, manifold_update_account, manifold_add_account,
+    manifold_delete_account, sfa_update_user, authority_get_pi_emails,
+    make_request_user, create_user)
+from portal.models                      import PendingUser, PendingAuthority
+
+from unfold.page                        import Page    
+from ui.topmenu                         import topmenu_items_live, the_user
+
+from myslice.theme                      import ThemeView
+from myslice.settings                   import logger
+
 
 def ValuesQuerySetToDict(vqs):
     return [item for item in vqs]
@@ -29,12 +38,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 as e:
+            logger.error("Exception in myplc query = {}".format(e))
+
         return False
 
     def dispatch(self, *args, **kwargs):
@@ -47,7 +60,6 @@ class ActivateEmailView(FreeAccessView, ThemeView):
         #page.add_css_files ( [ "css/onelab.css", "css/account_view.css","css/plugin.css" ] )
 
         for key, value in kwargs.iteritems():
-            #print "%s = %s" % (key, value)
             if key == "hash_code":
                 hash_code=value
         if PendingUser.objects.filter(email_hash__iexact = hash_code).filter(status__iexact = 'False'):           
@@ -74,7 +86,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'
@@ -96,10 +108,10 @@ class ActivateEmailView(FreeAccessView, ThemeView):
                         #    msg = EmailMultiAlternatives(subject, text_content, sender, recipients)
                         #    msg.attach_alternative(html_content, "text/html")
                         #    msg.send()
-                        #except Exception, e:
-                        #    print "Failed to send email, please check the mail templates and the SMTP configuration of your server"
+                        #except Exception as e:
+                        #    logger.error("Failed to send email, please check the mail templates and the SMTP configuration of your server")
                         #    import traceback
-                        #    traceback.print_exc()
+                        #    logger.error(traceback.format_exc())
             
             PendingUser.objects.filter(email_hash__iexact = hash_code).update(status='True')
         else: