Pavan Koli has proposed merging lp:~pskoli93/postorius/Change into lp:postorius.
Commit message:
"Changes in models.py"
Requested reviews:
Mailman Coders (mailman-coders)
Related bugs:
Bug #1437866 in Postorius: "AttributeError while adding another email address
to your account"
https://bugs.launchpad.net/postorius/+bug/1437866
For more details, see:
https://code.launchpad.net/~pskoli93/postorius/Change/+merge/254635
Made changes in models.py now a person will be able to add alternate e-mail ids
to his account.
--
Your team Mailman Coders is requested to review the proposed merge of
lp:~pskoli93/postorius/Change into lp:postorius.
=== modified file 'src/postorius/models.py'
--- src/postorius/models.py 2015-02-09 14:35:44 +0000
+++ src/postorius/models.py 2015-03-30 19:02:56 +0000
@@ -261,8 +261,8 @@
The following settings are recognized:
>>> EMAIL_CONFIRMATION_TEMPLATE = 'postorius/address_confirmation_message.txt'
- >>> EMAIL_CONFIRMATION_FROM = 'Confirmation needed'
- >>> EMAIL_CONFIRMATION_SUBJECT = 'postmas...@list.org'
+ >>> EMAIL_CONFIRMATION_FROM = 'postmas...@list.org'
+ >>> EMAIL_CONFIRMATION_SUBJECT = 'Confirmation needed'
:param request: The HTTP request object.
:type request: HTTPRequest
@@ -291,5 +291,5 @@
settings, 'EMAIL_CONFIRMATION_SUBJECT', u'Confirmation needed')
send_mail(email_subject,
get_template(template_path).render(template_context),
- getattr(settings, 'EMAIL_CONFIRMATION_FROM'),
+ getattr(settings, 'EMAIL_CONFIRMATION_FROM', self.mail),
[self.email])
_______________________________________________
Mailman-coders mailing list
Mailman-coders@python.org
https://mail.python.org/mailman/listinfo/mailman-coders
