CGM_Public/pretix_cgo
1
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions Activity

Fix #576 yet again

Browse Source
This commit is contained in:
Raphael Michel
2017-08-08 23:02:45 +02:00
parent ca1b1032eb
commit 349e306d38
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/pretix/base/services/mail.py
View File

@@ -168,7 +168,7 @@ def render_mail(template, context):
if context: if context:
body = body.format_map(TolerantDict(context)) body = body.format_map(TolerantDict(context))
body_md = bleach.linkify(bleach.clean(markdown.markdown(body), tags=bleach.ALLOWED_TAGS + [ body_md = bleach.linkify(bleach.clean(markdown.markdown(body), tags=bleach.ALLOWED_TAGS + [
'p', 'p', 'pre'
])) ]))
else: else:
tpl = get_template(template) tpl = get_template(template)

4
src/pretix/plugins/banktransfer/payment.py
View File

@@ -1,5 +1,5 @@
import json import json
import re import textwrap
from collections import OrderedDict from collections import OrderedDict
from django.template.loader import get_template from django.template.loader import get_template
@@ -47,7 +47,7 @@ class BankTransfer(BasePaymentProvider):
ctx = { ctx = {
'event': self.event, 'event': self.event,
'order': order, 'order': order,
'details': re.sub('^', ' ', self.settings.get('bank_details', as_type=LazyI18nString), flags=re.MULTILINE), 'details': textwrap.indent(str(self.settings.get('bank_details', as_type=LazyI18nString)), ' '),
} }
return template.render(ctx) return template.render(ctx)