From: Loic Baron <loic.baron@lip6.fr>
Date: Fri, 25 Jul 2014 18:28:53 +0000 (-0300)
Subject: Manually Merging
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=b153ca1650ad76473993cdd0cb27e5124ebe7200;p=unfold.git

Manually Merging
---

diff --git a/portal/managementtabrequests.py b/portal/managementtabrequests.py
index 6e37f1d4..85985a06 100644
--- a/portal/managementtabrequests.py
+++ b/portal/managementtabrequests.py
@@ -33,7 +33,7 @@ class ManagementRequestsView (LoginRequiredView, ThemeView):
         # The user need to be logged in
         if (self.request.user):
            
-            user_query = Query().get('local:user').filter_by('email', '==', self.request.user.email).select('user_id')
+            user_query = Query().get('local:user').filter_by('email', '==', self.request.user.username).select('user_id')
             user, = execute_query(self.request, user_query)
             user_id = user['user_id']
 
diff --git a/portal/registrationview.py b/portal/registrationview.py
index 909f2a13..df3f2dc7 100644
--- a/portal/registrationview.py
+++ b/portal/registrationview.py
@@ -84,7 +84,7 @@ class RegistrationView (FreeAccessView, ThemeView):
                 'current_site'  : current_site,
                 'email_hash'    : email_hash,
                 'pi'            : '',
-                'validation_link': 'http://' + current_site + '/portal/email_activation/'+ email_hash
+                'validation_link': 'https://' + current_site + '/portal/email_activation/'+ email_hash
             }
 
             # Construct user_hrn from email (XXX Should use common code)