подписка + изменение размера картинки на 200

remotes/origin/stage6
Alexander Burdeinyi 9 years ago
parent 06e8f48665
commit a47f192259
  1. 2
      emencia/django/newsletter/mailer.py
  2. 24
      events/views.py
  3. 2
      templates/client/popups/event_news_subscribe.html

@ -131,7 +131,7 @@ dailymail_attahcments = {
context_attachments_size = { context_attachments_size = {
'recommended': '170x170', 'recommended': '170x170',
'news': '170x170', 'news': '170x170',
'blog': '170x170', 'blog': '200x170',
'moscow': '109x114', 'moscow': '109x114',
'russia': '109x114', 'russia': '109x114',
'foreign': '109x114', 'foreign': '109x114',

@ -112,18 +112,19 @@ class SubscribeView(FormView):
def get_contact(self): def get_contact(self):
user = self.request.user user = self.request.user
defaults = { # defaults = {
'first_name': user.first_name, # 'first_name': user.first_name,
'last_name': user.last_name, # 'last_name': user.last_name,
'email': user.email, # 'email': user.email,
'user': user, # 'user': user,
} # }
defaults.update(self.defaults) # defaults.update(self.defaults)
try: try:
contact = Contact.objects.filter(Q(user=user) | Q(email=user.email))[0] contact = Contact.objects.filter(Q(user=user) | Q(email=user.email))[0]
except (Contact.DoesNotExist, IndexError): except (Contact.DoesNotExist, IndexError):
contact = Contact(**defaults) contact = None
contact.save() # contact = Contact(**defaults)
# contact.save()
return contact return contact
def get_form_kwargs(self): def get_form_kwargs(self):
@ -153,6 +154,8 @@ class SubscribeView(FormView):
contact = form.save(commit=False) contact = form.save(commit=False)
if not contact.pk: if not contact.pk:
contact.dailymailing = False contact.dailymailing = False
if self.request.user.is_authenticated():
contact.user = self.request.user
contact.save() contact.save()
contact.send_activation() contact.send_activation()
self._redirect_url = self.redirect_url self._redirect_url = self.redirect_url
@ -166,7 +169,8 @@ class SubscribeView(FormView):
def post(self, request, *args, **kwargs): def post(self, request, *args, **kwargs):
if request.user.is_authenticated(): if request.user.is_authenticated():
self.contact = self.get_contact() 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) return super(SubscribeView, self).post(request, *args, **kwargs)

@ -13,7 +13,7 @@
</p> </p>
<form id="event-news-subscribe-form" method="post" class="pw-form" action="{% url 'events:subscribe' object.event_type object.url %}"> <form id="event-news-subscribe-form" method="post" class="pw-form" action="{% url 'events:subscribe' object.event_type object.url %}">
{% csrf_token %} {% 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-line">
<div class="pwf-field required"> <div class="pwf-field required">
<input type="email" name="email" id="id_email" placeholder="Email"> <input type="email" name="email" id="id_email" placeholder="Email">

Loading…
Cancel
Save