m

emencia/django/newsletter/forms.py

@@ -224,7 +224,8 @@ class ContactForm(forms.ModelForm):
             self.instance = Contact.objects.get(email__iexact=email)
             return email
         except (Contact.DoesNotExist, ):
-            return email
+            pass
+        return email
 
 
 class ContactSettingsForm(forms.ModelForm):

emencia/django/newsletter/mailer.py

@@ -332,9 +332,12 @@ class NewsLetterSender(object):
         return message_attachment
 
     def gen_attachment_logo(self, obj=None, prefix='logo_', resize=None, logo=None, **kwargs):
+        logo_path = None
         if obj is not None:
             if prefix == 'blog':
                 logo = obj.get_blog_preview2()
+                if logo:
+                    logo_path = logo.logo_path
             else:
                 logo = getattr(obj, 'logo')
         if not logo:

events/views.py

@@ -122,7 +122,7 @@ class SubscribeView(FormView):
         try:
             contact = Contact.objects.filter(Q(user=user) | Q(email=user.email))[0]
         except (Contact.DoesNotExist, IndexError):
-            contact = Contact(defaults)
+            contact = Contact(**defaults)
             contact.save()
         return contact