diff options
| author | piernov <piernov@piernov.org> | 2015-02-28 21:38:06 +0100 |
|---|---|---|
| committer | piernov <piernov@piernov.org> | 2015-02-28 21:38:06 +0100 |
| commit | 2a8cf25c394d9bd89d5d9bfb34bc6b32c3a61454 (patch) | |
| tree | 0071de7abe9a61d5a74f9ba7296dcd0d9bee2a5c | |
| parent | 2e9a70b0a63ec72c9ff84675b23057388f054626 (diff) | |
| download | jm2l-2a8cf25c394d9bd89d5d9bfb34bc6b32c3a61454.tar.gz jm2l-2a8cf25c394d9bd89d5d9bfb34bc6b32c3a61454.tar.bz2 jm2l-2a8cf25c394d9bd89d5d9bfb34bc6b32c3a61454.tar.xz jm2l-2a8cf25c394d9bd89d5d9bfb34bc6b32c3a61454.zip | |
Generate user registration validation link from request URL
| -rw-r--r-- | jm2l/templates/Participer.mako | 2 | ||||
| -rw-r--r-- | jm2l/templates/mail_html.mako | 8 | ||||
| -rw-r--r-- | jm2l/templates/mail_plain.mako | 8 | ||||
| -rw-r--r-- | jm2l/views.py | 6 |
4 files changed, 12 insertions, 12 deletions
diff --git a/jm2l/templates/Participer.mako b/jm2l/templates/Participer.mako index 74d376d..de636a2 100644 --- a/jm2l/templates/Participer.mako +++ b/jm2l/templates/Participer.mako @@ -71,7 +71,7 @@ DicForm ={ Vous venez de recevoir un mail... Ici, ... le texte à définir ... </p> - Cliquez sur ce lien pour finir votre inscription : <a href="/sign/jm2l/${link}">Mon lien</a> + Cliquez sur ce lien pour finir votre inscription : <a href="${request.route_path('bymail', hash=link)}">Mon lien</a> % endif <br> <br> diff --git a/jm2l/templates/mail_html.mako b/jm2l/templates/mail_html.mako index 29f761e..b4facfe 100644 --- a/jm2l/templates/mail_html.mako +++ b/jm2l/templates/mail_html.mako @@ -1,16 +1,16 @@ ## -*- coding: utf-8 -*- -<%def name="Bienvenue(User)"> +<%def name="Bienvenue(request, User)"> <H4>JM2L</H4> <p> Bonjour ${User.prenom}.<br> Vous venez de valider votre inscription sur le site des JM2L.<br> -Voici <a href="http://jm2l.style-python.fr/sign/jm2l/${User.my_hash}">votre lien</a> pour vous connecter.<br> +Voici <a href="${request.route_url('bymail', hash=User.my_hash)}">votre lien</a> pour vous connecter.<br> Toute l'équipe vous souhaite une agréable visite !<br> </p> </%def> \ % if action=='Welcome': -${self.Bienvenue(User)} -% endif
\ No newline at end of file +${self.Bienvenue(request, User)} +% endif diff --git a/jm2l/templates/mail_plain.mako b/jm2l/templates/mail_plain.mako index 7ab174b..a5ae5b4 100644 --- a/jm2l/templates/mail_plain.mako +++ b/jm2l/templates/mail_plain.mako @@ -1,15 +1,15 @@ ## -*- coding: utf-8 -*- -<%def name="Bienvenue(User)"> +<%def name="Bienvenue(request, User)"> Bonjour ${User.prenom}. Vous venez de valider votre inscription sur le site des JM2L. Voici votre le lien pour vous connecter à votre profil: -http://jm2l.style-python.fr/sign/jm2l/${User.my_hash} +${request.route_url('bymail', hash=User.my_hash)} Toute l'équipe vous souhaite une très agréable visite ! </%def> \ % if action=='Welcome': -${self.Bienvenue(User)} -% endif
\ No newline at end of file +${self.Bienvenue(request, User)} +% endif diff --git a/jm2l/views.py b/jm2l/views.py index f8fa96e..d11372c 100644 --- a/jm2l/views.py +++ b/jm2l/views.py @@ -649,12 +649,12 @@ def participer(request): NewUser = TmpUsr # Prepare Plain Text Message : Mail_template = Template(filename='jm2l/templates/mail_plain.mako') - mail_plain = Mail_template.render(User=NewUser, action="Welcome") + mail_plain = Mail_template.render(request=request, User=NewUser, action="Welcome") body = Attachment(data=mail_plain, transfer_encoding="quoted-printable") # Prepare HTML Message : Mail_template = Template(filename='jm2l/templates/mail_html.mako') - mail_html = Mail_template.render(User=NewUser, action="Welcome") + mail_html = Mail_template.render(request=request, User=NewUser, action="Welcome") html = Attachment(data=mail_html, transfer_encoding="quoted-printable") # Prepare Message @@ -1067,4 +1067,4 @@ def forbidden(reason, request): #return Response('forbidden') request.response.status = 404 return render_to_response('jm2l:templates/Errors/404.mak', { "reason":reason }, - request=request) + request=request)
\ No newline at end of file |