From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Thu, 21 Aug 2014 16:31:36 +0000 (+0200)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~13^2~26^2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=de2df3591481f1661dc89c9fba535f8494b16f3a;hp=fd667c583e4d46fe428e6fd042a306a019163973;p=unfold.git

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

diff --git a/portal/emailactivationview.py b/portal/emailactivationview.py
index b7f9cd54..533cccfa 100644
--- a/portal/emailactivationview.py
+++ b/portal/emailactivationview.py
@@ -74,7 +74,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'