aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpiernov <piernov@piernov.org>2015-03-01 20:22:59 +0100
committerpiernov <piernov@piernov.org>2015-03-01 20:23:12 +0100
commit67631117e5375bc96e638ae02b7d9184e1474c29 (patch)
tree3b4b1f0ab018124c7f092297bd1f032a77149b6f
parent85c3f9068fae9c153edcff6579fd6e50f051b1d9 (diff)
downloadjm2l-67631117e5375bc96e638ae02b7d9184e1474c29.tar.gz
jm2l-67631117e5375bc96e638ae02b7d9184e1474c29.tar.bz2
jm2l-67631117e5375bc96e638ae02b7d9184e1474c29.tar.xz
jm2l-67631117e5375bc96e638ae02b7d9184e1474c29.zip
Fix link in mail when user with similar name already exists
-rw-r--r--jm2l/views.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/jm2l/views.py b/jm2l/views.py
index f6bae52..28d34b7 100644
--- a/jm2l/views.py
+++ b/jm2l/views.py
@@ -653,14 +653,15 @@ def participer(request):
CheckExist=None
if CheckExist:
MyLink = CheckExist.my_hash
+ NewUser = CheckExist
else:
DBSession.add(TmpUsr)
DBSession.flush()
MyLink = TmpUsr.my_hash
+ NewUser = TmpUsr
- mailer = request.registry['mailer']
# Send the Welcome Mail
- NewUser = TmpUsr
+ mailer = request.registry['mailer']
# Prepare Plain Text Message :
Mail_template = Template(filename='jm2l/templates/mail_plain.mako')
mail_plain = Mail_template.render(request=request, User=NewUser, action="Welcome")