diff --git a/crc/services/email_service.py b/crc/services/email_service.py index 1f01e423..8f5630be 100644 --- a/crc/services/email_service.py +++ b/crc/services/email_service.py @@ -66,11 +66,11 @@ class EmailService(object): def get_rendered_content(self, message, data): template = Template(message) - rendered = template.render(data) - rendered_markdown = markdown.markdown(rendered) - wrapped = self.get_cr_connect_wrapper(rendered_markdown) + content = template.render(data) + rendered_markdown = markdown.markdown(content, extensions=['nl2br']) + content_html = self.get_cr_connect_wrapper(rendered_markdown) - return rendered, wrapped + return content, content_html @staticmethod def get_cr_connect_wrapper(email_body): diff --git a/tests/data/email/email.bpmn b/tests/data/email/email.bpmn index 367c3185..40489409 100644 --- a/tests/data/email/email.bpmn +++ b/tests/data/email/email.bpmn @@ -17,7 +17,11 @@ New request submitted by {{ PIComputingID }} Email content to be delivered to {{ ApprvlApprvr1 }} ---- +--- +**Test Some Formatting** + _UVA Tracking Number:_ {{ 321 }} + + Flow_08n2npe Flow_1xlrgne subject="Camunda Email Subject" diff --git a/tests/emails/test_email_script.py b/tests/emails/test_email_script.py index 588b6f33..0b1ec499 100644 --- a/tests/emails/test_email_script.py +++ b/tests/emails/test_email_script.py @@ -29,6 +29,9 @@ class TestEmailScript(BaseTest): self.assertIn(task_data['ApprvlApprvr1'], outbox[0].body) self.assertIn(task_data['ApprvlApprvr1'], outbox[0].html) + # Test nl2br formatting + self.assertIn('Test Some Formatting
', outbox[0].html) + # Correct From field self.assertEqual('uvacrconnect@virginia.edu', outbox[0].sender)