emails

[myslice.git] / portal / emailactivationview.py

diff --git a/portal/emailactivationview.py b/portal/emailactivationview.py
index c54cdcb..02f56dd 100644 (file)
--- a/portal/emailactivationview.py
+++ b/portal/emailactivationview.py
@@ -7,7 +7,6 @@ from django.http                        import HttpResponse, HttpResponseRedirec
 from django.contrib                     import messages
 from django.contrib.auth.decorators     import login_required
 from django.core.mail                   import EmailMultiAlternatives, send_mail
-from django.contrib.sites.models        import Site
 
 from manifold.core.query                import Query
 from manifoldapi.manifoldapi            import execute_query, execute_admin_query
@@ -24,8 +23,7 @@ from unfold.page                        import Page
 from ui.topmenu                         import topmenu_items_live, the_user
 
 from myslice.theme                      import ThemeView
-from myslice.settings                   import logger
-
+from myslice.settings import logger
 
 def ValuesQuerySetToDict(vqs):
     return [item for item in vqs]
@@ -58,12 +56,18 @@ class ActivateEmailView(FreeAccessView, ThemeView):
         page = Page(self.request)
         #page.add_js_files  ( [ "js/jquery.validate.js", "js/my_account.register.js", "js/my_account.edit_profile.js" ] )
         #page.add_css_files ( [ "css/onelab.css", "css/account_view.css","css/plugin.css" ] )
+        if self.request.is_secure():
+            current_site = 'https://'
+        else:
+            current_site = 'http://'
+        current_site += self.request.META['HTTP_HOST']
 
         for key, value in kwargs.iteritems():
             if key == "hash_code":
                 hash_code=value
 
-        if PendingUser.objects.filter(email_hash__iexact = hash_code).filter(status__iexact = 'False'):           
+        #if PendingUser.objects.filter(email_hash__iexact = hash_code).filter(status__iexact = 'False'):
+        if PendingUser.objects.filter(email_hash__iexact = hash_code):
             activation = 'success'
             pending_users = PendingUser.objects.filter(email_hash__iexact = hash_code)
             pending_user = pending_users[0]
@@ -99,15 +103,13 @@ class ActivateEmailView(FreeAccessView, ThemeView):
             u['email']         =  pending_user.email        
             u['user_hrn']      =  pending_user.user_hrn     
             u['pi']            =  pending_user.pi           
+            u['public_key']    =  pending_user.public_key
+            u['current_site']  = current_site
 
             send_email_to_pis(self.request, u, 'user')
         else:
             activation = 'failed'
         
-        # get the domain url
-        current_site = Site.objects.get_current()
-        current_site = current_site.domain
-
         
         context = super(ActivateEmailView, self).get_context_data(**kwargs)
         context['activation_status'] = activation
@@ -121,10 +123,8 @@ class ActivateEmailView(FreeAccessView, ThemeView):
         #context['first_name'] = first_name
         #context['last_name'] = last_name
         #context['authority_hrn'] = authority_hrn
-        #context['public_key'] = public_key
         #context['email'] = email
         #context['user_hrn'] = user_hrn
-        #context['current_site'] = current_site
         context['theme'] = self.theme
 #        context ['firstname'] = config['firstname']
         prelude_env = page.prelude_env()