diff options
| author | Magnus Hagander | 2015-01-22 14:06:32 +0000 |
|---|---|---|
| committer | Magnus Hagander | 2015-01-22 14:06:32 +0000 |
| commit | 486794d3a90951495a68449fc95902a6b53cf3cc (patch) | |
| tree | f14f1ca35b841e3e1e79f1d4076a442bf488d265 | |
| parent | 0c58317302c0eeea57dcbafa28b5150b82eba3de (diff) | |
Fix email address in comment
| -rw-r--r-- | pgcommitfest/auth.py | 2 | ||||
| -rw-r--r-- | pgcommitfest/mailqueue/util.py | 4 | ||||
| -rw-r--r-- | pgcommitfest/userprofile/views.py | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/pgcommitfest/auth.py b/pgcommitfest/auth.py index 769ebab..b17efd8 100644 --- a/pgcommitfest/auth.py +++ b/pgcommitfest/auth.py @@ -130,7 +130,7 @@ def auth_receive(request): a different username than %s. This is almost certainly caused by some legacy data in our database. -Please send an email to [email protected], indicating the username +Please send an email to [email protected], indicating the username and email address from above, and we'll manually marge the two accounts for you. diff --git a/pgcommitfest/mailqueue/util.py b/pgcommitfest/mailqueue/util.py index 38e1145..525f068 100644 --- a/pgcommitfest/mailqueue/util.py +++ b/pgcommitfest/mailqueue/util.py @@ -39,7 +39,7 @@ def send_mail(sender, receiver, fullmsg): # Send an email, prepared as the full MIME encoded mail already QueuedMail(sender=sender, receiver=receiver, fullmsg=fullmsg).save() -def send_template_mail(sender, receiver, subject, templatename, templateattr={}, usergenerated=False): +def send_template_mail(sender, senderaccountname, receiver, subject, templatename, templateattr={}, usergenerated=False): send_simple_mail(sender, receiver, subject, get_template(templatename).render(Context(templateattr)), - '__internal') + senderaccountname) diff --git a/pgcommitfest/userprofile/views.py b/pgcommitfest/userprofile/views.py index 0d19a4f..6b7499d 100644 --- a/pgcommitfest/userprofile/views.py +++ b/pgcommitfest/userprofile/views.py @@ -37,6 +37,7 @@ def userprofile(request): tokensent=datetime.now()) m.save() send_template_mail(settings.NOTIFICATION_FROM, + request.user.username, m.email, 'Your email address for commitfest.postgresql.org', 'extra_email_mail.txt', |