kallithea Changeset - fc311d8c3997

Changeset - fc311d8c3997

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Andrew Shadura - 11 years ago 2015-01-23 21:26:11
andrew@shadura.me

email templates: render text part with unrendered RST, not HTML

1 file changed with 14 insertions and 5 deletions:

kallithea/model/notification.py

0 comments (0 inline, 0 general)

kallithea/model/notification.py

➞

Show inline comments

@@ @@ -118,25 +118,34 @@ class NotificationModel(BaseModel): @@
         if 'threading' in email_kwargs:
             headers = {'References': ' '.join('<%s>' % x for x in email_kwargs['threading'])}
         # send email with notification to all other participants
         for rec in rec_objs:
             ## this is passed into template
             kwargs = {'subject': subject,
             html_kwargs = {
                       'subject': subject,
                       'body': h.rst_w_mentions(body),
                       'when': h.fmt_date(notif.created_on),
                       'user': notif.created_by_user.username,
+                      }
             kwargs.update(email_kwargs)
             txt_kwargs = {
                       'subject': subject,
                       'body': body,
                       'when': h.fmt_date(notif.created_on),
                       'user': notif.created_by_user.username,
+                      }
             html_kwargs.update(email_kwargs)
             txt_kwargs.update(email_kwargs)
             email_subject = EmailNotificationModel()\
-                                .get_email_description(type_, **kwargs)
+                                .get_email_description(type_, **txt_kwargs)
             email_txt_body = EmailNotificationModel()\
-                                .get_email_tmpl(type_, 'txt', **kwargs)
+                                .get_email_tmpl(type_, 'txt', **txt_kwargs)
             email_html_body = EmailNotificationModel()\
-                                .get_email_tmpl(type_, 'html', **kwargs)
+                                .get_email_tmpl(type_, 'html', **html_kwargs)
             run_task(tasks.send_email, [rec.email], email_subject, email_txt_body,
                      email_html_body, headers)
         return notif

0 comments (0 inline, 0 general)