From a47f19225977f0fb660ad333e7b996e9b6048ed0 Mon Sep 17 00:00:00 2001
From: Alexander Burdeinyi <bonus05@gmail.com>
Date: Wed, 28 Dec 2016 15:02:54 +0200
Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=BE=D0=B4=D0=BF=D0=B8=D1=81=D0=BA?=
 =?UTF-8?q?=D0=B0=20+=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B5=20=D1=80=D0=B0=D0=B7=D0=BC=D0=B5=D1=80=D0=B0=20=D0=BA?=
 =?UTF-8?q?=D0=B0=D1=80=D1=82=D0=B8=D0=BD=D0=BA=D0=B8=20=D0=BD=D0=B0=20200?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 emencia/django/newsletter/mailer.py           |  2 +-
 events/views.py                               | 24 +++++++++++--------
 .../client/popups/event_news_subscribe.html   |  2 +-
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/emencia/django/newsletter/mailer.py b/emencia/django/newsletter/mailer.py
index d93d23b9..991a6bd5 100644
--- a/emencia/django/newsletter/mailer.py
+++ b/emencia/django/newsletter/mailer.py
@@ -131,7 +131,7 @@ dailymail_attahcments = {
 context_attachments_size = {
     'recommended': '170x170',
     'news': '170x170',
-    'blog': '170x170',
+    'blog': '200x170',
     'moscow': '109x114',
     'russia': '109x114',
     'foreign': '109x114',
diff --git a/events/views.py b/events/views.py
index c18430c8..a160ac5b 100644
--- a/events/views.py
+++ b/events/views.py
@@ -112,18 +112,19 @@ class SubscribeView(FormView):
 
     def get_contact(self):
         user = self.request.user
-        defaults = {
-            'first_name': user.first_name,
-            'last_name': user.last_name,
-            'email': user.email,
-            'user': user,
-        }
-        defaults.update(self.defaults)
+        # defaults = {
+        #     'first_name': user.first_name,
+        #     'last_name': user.last_name,
+        #     'email': user.email,
+        #     'user': user,
+        # }
+        # defaults.update(self.defaults)
         try:
             contact = Contact.objects.filter(Q(user=user) | Q(email=user.email))[0]
         except (Contact.DoesNotExist, IndexError):
-            contact = Contact(**defaults)
-            contact.save()
+            contact = None
+            # contact = Contact(**defaults)
+            # contact.save()
         return contact
 
     def get_form_kwargs(self):
@@ -153,6 +154,8 @@ class SubscribeView(FormView):
         contact = form.save(commit=False)
         if not contact.pk:
             contact.dailymailing = False
+            if self.request.user.is_authenticated():
+                contact.user = self.request.user
             contact.save()
             contact.send_activation()
             self._redirect_url = self.redirect_url
@@ -166,7 +169,8 @@ class SubscribeView(FormView):
     def post(self, request, *args, **kwargs):
         if request.user.is_authenticated():
             self.contact = self.get_contact()
-            return self.success_responce()
+            if self.contact is not None:
+                return self.success_responce()
         return super(SubscribeView, self).post(request, *args, **kwargs)
 
 
diff --git a/templates/client/popups/event_news_subscribe.html b/templates/client/popups/event_news_subscribe.html
index d688d006..81dfc643 100644
--- a/templates/client/popups/event_news_subscribe.html
+++ b/templates/client/popups/event_news_subscribe.html
@@ -13,7 +13,7 @@
             </p>
 			<form id="event-news-subscribe-form" method="post" class="pw-form"  action="{% url 'events:subscribe' object.event_type object.url %}">
                 {% csrf_token %}
-				{% if not user.is_authenticated %}
+				{% if not user.is_authenticated or not user.contact_set.exists %}
                     <div class="pwf-line">
                         <div class="pwf-field required">
                             <input type="email" name="email" id="id_email" placeholder="Email">