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

Fix error in SMTP settings when not changing password

Browse Source
This commit is contained in:
Raphael Michel
2022-03-15 16:06:11 +01:00
parent 0adddb3084
commit 31eda01464
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/pretix/base/forms/__init__.py
View File

@@ -113,10 +113,13 @@ class SettingsForm(i18nfield.forms.I18nFormMixin, HierarkeyForm):
if isinstance(f, (RelativeDateTimeField, RelativeDateField)): if isinstance(f, (RelativeDateTimeField, RelativeDateField)):
f.set_event(self.obj) f.set_event(self.obj)
def save(self): def _unmask_secret_fields(self):
for k, v in self.cleaned_data.items(): for k, v in self.cleaned_data.items():
if isinstance(self.fields.get(k), SecretKeySettingsField) and self.cleaned_data.get(k) == SECRET_REDACTED: if isinstance(self.fields.get(k), SecretKeySettingsField) and self.cleaned_data.get(k) == SECRET_REDACTED:
self.cleaned_data[k] = self.initial[k] self.cleaned_data[k] = self.initial[k]
def save(self):
self._unmask_secret_fields()
return super().save() return super().save()
def clean(self): def clean(self):

2
src/pretix/control/views/mailsetup.py
View File

@@ -243,6 +243,8 @@ class MailSettingsSetupView(TemplateView):
messages.success(request, _('Your changes have been saved.')) messages.success(request, _('Your changes have been saved.'))
return redirect(self.get_success_url()) return redirect(self.get_success_url())
else: else:
self.smtp_form._unmask_secret_fields()
backend = get_connection( backend = get_connection(
backend=settings.EMAIL_CUSTOM_SMTP_BACKEND, backend=settings.EMAIL_CUSTOM_SMTP_BACKEND,
host=self.smtp_form.cleaned_data['smtp_host'], host=self.smtp_form.cleaned_data['smtp_host'],