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