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

rename parameter

Browse Source
This commit is contained in:
Mira Weller
2024-06-04 14:37:44 +02:00
parent 795dd64219
commit 2bfacd925a
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/pretix/base/forms/validators.py
View File

@@ -66,7 +66,7 @@ class PlaceholderValidator(BaseValidator):
return
try:
format_map(value, {key.strip('{}'): "" for key in self.limit_value}, ignore_missing_keys=False)
format_map(value, {key.strip('{}'): "" for key in self.limit_value}, raise_on_missing=True)
except ValueError:
raise ValidationError(self.error_message, code='invalid_placeholder_syntax')
except KeyError as e:

6
src/pretix/control/views/event.py
View File

@@ -756,10 +756,12 @@ class MailSettingsPreview(EventPermissionRequiredMixin, View):
with language(self.supported_locale[idx], self.request.event.settings.region):
try:
if k.startswith('mail_subject_'):
msgs[self.supported_locale[idx]] = format_map(bleach.clean(v), self.placeholders(preview_item), ignore_missing_keys=False)
msgs[self.supported_locale[idx]] = format_map(
bleach.clean(v), self.placeholders(preview_item), raise_on_missing=True
)
else:
msgs[self.supported_locale[idx]] = markdown_compile_email(
format_map(v, self.placeholders(preview_item), ignore_missing_keys=False)
format_map(v, self.placeholders(preview_item), raise_on_missing=True)
)
except ValueError:
msgs[self.supported_locale[idx]] = '<div class="alert alert-danger">{}</div>'.format(

10
src/pretix/helpers/format.py
View File

@@ -30,15 +30,15 @@ class SafeFormatter(Formatter):
Customized version of ``str.format`` that (a) behaves just like ``str.format_map`` and
(b) does not allow any unwanted shenanigans like attribute access or format specifiers.
"""
def __init__(self, context, ignore_missing_keys=True):
def __init__(self, context, raise_on_missing=False):
self.context = context
self.ignore_missing_keys = ignore_missing_keys
self.raise_on_missing = raise_on_missing
def get_field(self, field_name, args, kwargs):
return self.get_value(field_name, args, kwargs), field_name
def get_value(self, key, args, kwargs):
if self.ignore_missing_keys and key not in self.context:
if not self.raise_on_missing and key not in self.context:
return '{' + str(key) + '}'
return self.context[key]
@@ -47,7 +47,7 @@ class SafeFormatter(Formatter):
return super().format_field(value, '')
def format_map(template, context, ignore_missing_keys=True):
def format_map(template, context, raise_on_missing=False):
if not isinstance(template, str):
template = str(template)
return SafeFormatter(context, ignore_missing_keys).format(template)
return SafeFormatter(context, raise_on_missing).format(template)