From 0f1803c4486df0cf37649792c9e31448972c0026 Mon Sep 17 00:00:00 2001 From: Alexander Burdeiny Date: Wed, 20 Jul 2016 17:37:26 +0300 Subject: [PATCH] =?UTF-8?q?1465:=20=D0=AD=D1=82=D0=B0=D0=BF=20=E2=84=965:?= =?UTF-8?q?=20=D0=A0=D0=B0=D1=81=D1=81=D1=8B=D0=BB=D0=BA=D0=B0=20-=20?= =?UTF-8?q?=D0=BA=D0=B0=D1=80=D1=82=D0=B8=D0=BD=D0=BA=D0=B8=20=D0=BF=D1=80?= =?UTF-8?q?=D0=B8=D1=85=D0=BE=D0=B4=D1=8F=D1=82=20=D0=B2=D0=BB=D0=BE=D0=B6?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=D0=BC=20=D1=83=D0=B1=D1=80=D0=B0=D0=BB?= =?UTF-8?q?=20css=20=D0=BA=D0=B0=D1=80=D1=82=D0=B8=D0=BD=D0=BA=D1=83=20?= =?UTF-8?q?=D0=B8=D0=B7=20=D0=BF=D0=B8=D1=81=D1=8C=D0=BC=D0=B0=20=D0=BF?= =?UTF-8?q?=D0=BE=D0=B4=D1=82=D0=B2=D0=B5=D1=80=D0=B6=D0=B4=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D1=8F=20=D0=BF=D0=BE=D0=B4=D0=BF=D0=B8=D1=81=D0=BA=D0=B8?= =?UTF-8?q?;=20=D0=BD=D0=B5=D0=B1=D0=BE=D0=BB=D1=8C=D1=88=D0=BE=D0=B9=20?= =?UTF-8?q?=D1=80=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE=D1=80=D0=B8=D0=BD?= =?UTF-8?q?=D0=B3=20=D0=BA=D0=BE=D0=B4=D0=B0=20=D0=BE=D1=82=D0=BF=D1=80?= =?UTF-8?q?=D0=B0=D0=B2=D1=89=D0=B8=D0=BA=D0=B0.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- emencia/django/newsletter/mailer.py | 10 ++++------ emencia/django/newsletter/models.py | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/emencia/django/newsletter/mailer.py b/emencia/django/newsletter/mailer.py index 072ec830..36e44c14 100644 --- a/emencia/django/newsletter/mailer.py +++ b/emencia/django/newsletter/mailer.py @@ -466,12 +466,10 @@ class Mailer(NewsLetterSender): if self.verbose: print '- Processing %s/%s (%s)' % ( i, number_of_recipients, contact.pk) - if self.announce: - # check if events for this newsletter exists - announce_context = contact.get_announce_context() - else: - announce_context = None - if not announce_context: + + # check if events for this newsletter exists + announce_context = contact.get_announce_context() if self.announce else None + if self.announce and not announce_context: send = False try: diff --git a/emencia/django/newsletter/models.py b/emencia/django/newsletter/models.py index 62546b32..ef95400e 100644 --- a/emencia/django/newsletter/models.py +++ b/emencia/django/newsletter/models.py @@ -231,7 +231,7 @@ class Contact(models.Model): msg = EmailMessage(subject, message, settings.DEFAULT_FROM_EMAIL, [user.email]) msg.content_subtype = "html" images =(('/img/logo_reg.png', 'logo'), - ('/img/soc-medias/sm-icon-rss.png', 'rss'), + # ('/img/soc-medias/sm-icon-rss.png', 'rss'), ('/img/soc-medias/sm-icon-fb.png', 'fb'), ('/img/soc-medias/sm-icon-lin.png', 'linkedin'), ('/img/soc-medias/sm-icon-vk.png', 'vk'),