diff --git a/HISTORY.rst b/HISTORY.rst index c60dcfa746..71ae0306d5 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -2,7 +2,10 @@ ================== * Add support for disabling the random primary key test mixin. - +* Fix mailing profile log columns mappings. + GitLab issue #626. Thanks to Jesaja Everling (@jeverling) + for the report. + 3.2.2 (2019-06-19) ================== * Fix document type change view. Closes GitLab issue #614 diff --git a/docs/releases/3.2.3.rst b/docs/releases/3.2.3.rst index 60dc84d965..afa995fedc 100644 --- a/docs/releases/3.2.3.rst +++ b/docs/releases/3.2.3.rst @@ -9,7 +9,10 @@ Changes - Add support for disabling the random primary key test mixin. - +- Fix mailing profile log columns mappings. + GitLab issue #626. Thanks to Jesaja Everling (@jeverling) + for the report. + Removals -------- @@ -98,6 +101,6 @@ Backward incompatible changes Bugs fixed or issues closed --------------------------- -- :gitlab-issue:`615` +- :gitlab-issue:`626` Mailing profile error log is empty, despite errors .. _PyPI: https://pypi.python.org/pypi/mayan-edms/ diff --git a/mayan/apps/mailer/apps.py b/mayan/apps/mailer/apps.py index 61d5860136..6a6c89160b 100644 --- a/mayan/apps/mailer/apps.py +++ b/mayan/apps/mailer/apps.py @@ -51,6 +51,7 @@ class MailerApp(MayanAppConfig): LogEntry = self.get_model(model_name='LogEntry') UserMailer = self.get_model(model_name='UserMailer') + UserMailerLogEntry = self.get_model(model_name='UserMailerLogEntry') MailerBackend.initialize() @@ -79,6 +80,13 @@ class MailerApp(MayanAppConfig): SourceColumn( source=UserMailer, attribute='backend_label' ) + SourceColumn( + attribute='datetime', label=_('Date and time'), + source=UserMailerLogEntry + ) + SourceColumn( + attribute='message', label=_('Message'), source=UserMailerLogEntry + ) ModelPermission.register( model=Document, permissions=( diff --git a/mayan/apps/mailer/views.py b/mayan/apps/mailer/views.py index ca8193d479..b2477c422e 100644 --- a/mayan/apps/mailer/views.py +++ b/mayan/apps/mailer/views.py @@ -208,7 +208,7 @@ class UserMailerLogEntryListView(SingleObjectListView): return { 'hide_object': True, 'object': self.get_user_mailer(), - 'title': _('%s error log') % self.get_user_mailer(), + 'title': _('Error log for: %s') % self.get_user_mailer(), } def get_source_queryset(self):