sending fixes

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())

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))

templates/admin/includes/admin_nav.html

@@ -115,6 +115,7 @@
                     <li><a href="/admin/newsletters/contact/all/">Подписчики</a></li>
                     <li><a href="/admin/newsletters/mailinglist/all/">Списки рассылок</a></li>
                     <li><a href="/admin/newsletters/newsletters/all/">Рассылки</a></li>
+                    <li><a href="/admin/newsletters/get-popup-statistics//">Статистика</a></li>
                 </ul>
               </li>