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

{% csrf_token %} - {% if not user.is_authenticated %} + {% if not user.is_authenticated or not user.contact_set.exists %}