aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpiernov <piernov@piernov.org>2015-03-01 20:24:01 +0100
committerpiernov <piernov@piernov.org>2015-03-01 20:24:01 +0100
commitabe7b23f51f146bcde41ddae5904e1ed3aa4ac92 (patch)
tree033b24dd26642a4b8c0c235c6571a52a602a1ae7
parent2d18215661b1da174e3fbf6078a0cca521e9319e (diff)
parent67631117e5375bc96e638ae02b7d9184e1474c29 (diff)
downloadjm2l-abe7b23f51f146bcde41ddae5904e1ed3aa4ac92.tar.gz
jm2l-abe7b23f51f146bcde41ddae5904e1ed3aa4ac92.tar.bz2
jm2l-abe7b23f51f146bcde41ddae5904e1ed3aa4ac92.tar.xz
jm2l-abe7b23f51f146bcde41ddae5904e1ed3aa4ac92.zip
Merge branch 'master' into python3
-rw-r--r--jm2l/views.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/jm2l/views.py b/jm2l/views.py
index 6889a1e..6fe3e4a 100644
--- a/jm2l/views.py
+++ b/jm2l/views.py
@@ -652,14 +652,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")