From: Loic Baron <loic.baron@lip6.fr>
Date: Tue, 17 Mar 2015 17:49:40 +0000 (+0100)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.3~56
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=63c56469d22c93065f6f448d06106ad9f36a839b;hp=c97330dc9973c5676824805d574b42690fd31f0c;p=unfold.git

Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
---

diff --git a/portal/joinview.py b/portal/joinview.py
index 721efcf2..2add3a4f 100644
--- a/portal/joinview.py
+++ b/portal/joinview.py
@@ -173,7 +173,7 @@ class JoinView (FreeAccessView, ThemeView):
                     'user_hrn'      : user_hrn,
                     'pi'            : [reg_auth],
                     'auth_type'     : 'managed',
-                    'validation_link': 'https://' + current_site + '/portal/email_activation/'+ email_hash
+                    'validation_link': current_site + '/portal/email_activation/'+ email_hash
                 }
 
                 
diff --git a/portal/registrationview.py b/portal/registrationview.py
index c631b235..2ce1efaf 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': 'https://' + current_site + '/portal/email_activation/'+ email_hash
+                'validation_link': current_site + '/portal/email_activation/'+ email_hash
             }
 
             print "############ BREAKPOINT 4 #################"