Fix the Django SMTP backend username field name
Increase the Django STMP username. GitLab issue #625. Thanks to Jesaja Everling (@jeverling) for the report and the research. Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
This commit is contained in:
@@ -5,6 +5,12 @@
|
||||
* Fix mailing profile log columns mappings.
|
||||
GitLab issue #626. Thanks to Jesaja Everling (@jeverling)
|
||||
for the report.
|
||||
* Fix the Django SMTP backend username field name.
|
||||
GitLab issue #625. Thanks to Jesaja Everling (@jeverling)
|
||||
for the report and the research.
|
||||
* Increase the Django STMP username.
|
||||
GitLab issue #625. Thanks to Jesaja Everling (@jeverling)
|
||||
for the report and the research.
|
||||
|
||||
3.2.2 (2019-06-19)
|
||||
==================
|
||||
|
||||
@@ -12,6 +12,12 @@ Changes
|
||||
- Fix mailing profile log columns mappings.
|
||||
GitLab issue #626. Thanks to Jesaja Everling (@jeverling)
|
||||
for the report.
|
||||
- Fix the Django SMTP backend username field name.
|
||||
GitLab issue #625. Thanks to Jesaja Everling (@jeverling)
|
||||
for the report and the research.
|
||||
- Increase the Django STMP username.
|
||||
GitLab issue #625. Thanks to Jesaja Everling (@jeverling)
|
||||
for the report and the research.
|
||||
|
||||
|
||||
Removals
|
||||
@@ -101,6 +107,7 @@ Backward incompatible changes
|
||||
Bugs fixed or issues closed
|
||||
---------------------------
|
||||
|
||||
- :gitlab-issue:`625` mayan.apps.mailer.mailers.DjangoSMTP uses "user", but django.core.mail.backends.smtp.EmailBackend expects "username"
|
||||
- :gitlab-issue:`626` Mailing profile error log is empty, despite errors
|
||||
|
||||
.. _PyPI: https://pypi.python.org/pypi/mayan-edms/
|
||||
|
||||
@@ -96,7 +96,7 @@ class UserMailerDynamicForm(DynamicModelForm):
|
||||
if self.instance.backend_data:
|
||||
backend_data = json.loads(self.instance.backend_data)
|
||||
for key in self.instance.get_backend().fields:
|
||||
self.fields[key].initial = backend_data[key]
|
||||
self.fields[key].initial = backend_data.get(key)
|
||||
|
||||
return result
|
||||
|
||||
|
||||
@@ -12,11 +12,11 @@ class DjangoSMTP(MailerBackend):
|
||||
Backend that wraps Django's SMTP backend
|
||||
"""
|
||||
class_fields = (
|
||||
'host', 'port', 'use_tls', 'use_ssl', 'user', 'password'
|
||||
'host', 'port', 'use_tls', 'use_ssl', 'username', 'password'
|
||||
)
|
||||
class_path = 'django.core.mail.backends.smtp.EmailBackend'
|
||||
field_order = (
|
||||
'host', 'port', 'use_tls', 'use_ssl', 'user', 'password', 'from'
|
||||
'host', 'port', 'use_tls', 'use_ssl', 'username', 'password', 'from'
|
||||
)
|
||||
fields = {
|
||||
'from': {
|
||||
@@ -60,14 +60,14 @@ class DjangoSMTP(MailerBackend):
|
||||
'that "Use TLS" and "Use SSL" are mutually exclusive, '
|
||||
'so only set one of those settings to True.'
|
||||
), 'required': False
|
||||
}, 'user': {
|
||||
}, 'username': {
|
||||
'label': _('Username'),
|
||||
'class': 'django.forms.CharField', 'default': '',
|
||||
'help_text': _(
|
||||
'Username to use for the SMTP server. If empty, '
|
||||
'authentication won\'t attempted.'
|
||||
), 'kwargs': {
|
||||
'max_length': 48
|
||||
'max_length': 254
|
||||
}, 'required': False
|
||||
}, 'password': {
|
||||
'label': _('Password'),
|
||||
|
||||
Reference in New Issue
Block a user