diff --git a/emencia/django/newsletter/mailer.py b/emencia/django/newsletter/mailer.py index b17669a5..46980a1a 100644 --- a/emencia/django/newsletter/mailer.py +++ b/emencia/django/newsletter/mailer.py @@ -34,6 +34,7 @@ from django.template.loader import render_to_string, get_template from django.utils.encoding import smart_str from django.utils.encoding import smart_unicode from django.core.urlresolvers import reverse +from django.core.exceptions import SuspiciousOperation from emencia.django.newsletter.models import Newsletter from emencia.django.newsletter.models import ContactMailingStatus @@ -212,7 +213,10 @@ class NewsLetterSender(object): logo = getattr(obj, 'logo') if not logo: return None - ctype, encoding = mimetypes.guess_type(logo.path) + try: + ctype, encoding = mimetypes.guess_type(logo.path) + except SuspiciousOperation: + return None if ctype is None or encoding is not None: ctype = 'application/octet-stream' @@ -377,10 +381,10 @@ class Mailer(NewsLetterSender): else: announce_context = None - + message = self.build_message(contact, announce_context) try: if send: - message = self.build_message(contact, announce_context) + self.smtp.sendmail(self.newsletter.header_sender, contact.email, message.as_string()) diff --git a/emencia/django/newsletter/models.py b/emencia/django/newsletter/models.py index ead9d23b..59f7f72b 100644 --- a/emencia/django/newsletter/models.py +++ b/emencia/django/newsletter/models.py @@ -322,7 +322,7 @@ class MailingList(models.Model): # simple data sending_date = day + timedelta(days=1) start_sending_time = datetime.combine(sending_date, datetime.min.time()) - title = u'Анонс событий на %s' % sending_date.strftime('%Y-%m-%y') + title = u'Анонс событий на %s' % sending_date.strftime('%Y-%m-%d') newsletter = Newsletter(status=Newsletter.WAITING, sending_date=start_sending_time, title=title, mailing_list=self, slug=translit_with_separator(title)) diff --git a/templates/admin/includes/admin_nav.html b/templates/admin/includes/admin_nav.html index 2ada523d..4cc79ce8 100644 --- a/templates/admin/includes/admin_nav.html +++ b/templates/admin/includes/admin_nav.html @@ -115,6 +115,7 @@