From 58706db29711cfe3a2320ef45c8e3197c338b8c1 Mon Sep 17 00:00:00 2001 From: Alexander Burdeinyi Date: Thu, 22 Dec 2016 18:42:01 +0200 Subject: [PATCH] m --- accounts/urls.py | 4 +-- accounts/views.py | 27 +++++++++++-------- emencia/django/newsletter/mailer.py | 2 +- .../newsletter/AutomaticEmail_v2.html | 7 ++--- .../client/accounts/mailing_settings.html | 4 +-- templates/client/popups/unsubscribed.html | 8 ++++-- 6 files changed, 29 insertions(+), 23 deletions(-) diff --git a/accounts/urls.py b/accounts/urls.py index 71451d28..eeaf3696 100644 --- a/accounts/urls.py +++ b/accounts/urls.py @@ -9,7 +9,7 @@ from views import ( Feed, HomeView, MailingSettings, - MailingSettingsUnsubscribe, + # MailingSettingsUnsubscribe, NameView, PhoneView, ProfileCompanyView, @@ -22,7 +22,7 @@ from views import ( urlpatterns = patterns('', url(r'^profile/company/$', login_required(ProfileCompanyView.as_view())), url(r'^profile/mailing/$', MailingSettings.as_view(), name='accounts-mailing_settings'), - url(r'^profile/mailing/unsubscribe/$', MailingSettingsUnsubscribe.as_view(), name='accounts-mailing_settings_unsubscribe'), + # url(r'^profile/mailing/unsubscribe/$', MailingSettingsUnsubscribe.as_view(), name='accounts-mailing_settings_unsubscribe'), url(r'^profile/settings/$', login_required(SettingsView.as_view()), name='accounts_settings'), url(r'^profile/calendar/remove/$', 'accounts.views.remove_from_calendar'), url(r'^profile/calendar/export/$', 'core.views.download_workbook'), diff --git a/accounts/views.py b/accounts/views.py index 760b8147..2e97cdd7 100644 --- a/accounts/views.py +++ b/accounts/views.py @@ -135,6 +135,11 @@ class MailingSettings(GetUserMixin, ContextMixin, AjaxableResponseMixin, CreateU }) elif not self.request.user.is_authenticated(): raise HttpResponseForbidden() + if self.request.GET.get('unsibscribe') and instance.subscriber: + instance.unsubscribe() + self.extra_ctx.update({'unsubscribe_success': True}) + elif not instance.subscriber: + self.extra_ctx.update({'unsubscribed': True}) return instance def form_valid(self, form): @@ -150,17 +155,17 @@ class MailingSettings(GetUserMixin, ContextMixin, AjaxableResponseMixin, CreateU # print(self.request.POST) return super(MailingSettings, self).form_invalid(form) - -class MailingSettingsUnsubscribe(GetUserMixin, RedirectView): - url = reverse_lazy('accounts-mailing_settings') - - def get(self, request, *args, **kwargs): - contact = self.get_user() - if contact is None: - return HttpResponseForbidden() - if contact.subscriber: - contact.unsubscribe() - return super(MailingSettingsUnsubscribe, self).get(request, *args, **kwargs) +# +# class MailingSettingsUnsubscribe(GetUserMixin, RedirectView): +# url = reverse_lazy('accounts-mailing_settings') +# +# def get(self, request, *args, **kwargs): +# contact = self.get_user() +# if contact is None: +# return HttpResponseForbidden() +# if contact.subscriber: +# contact.unsubscribe() +# return super(MailingSettingsUnsubscribe, self).get(request, *args, **kwargs) class CalendarView(TemplateView): diff --git a/emencia/django/newsletter/mailer.py b/emencia/django/newsletter/mailer.py index 4d9cb538..12c16c10 100644 --- a/emencia/django/newsletter/mailer.py +++ b/emencia/django/newsletter/mailer.py @@ -130,7 +130,7 @@ dailymail_attahcments = { } context_attachments_size = { 'recommended': '170x170', - 'news': '272x195', + 'news': '170x170', 'blog': '272x195', 'moscow': '109x114', 'russia': '109x114', diff --git a/emencia/django/newsletter/templates/newsletter/AutomaticEmail_v2.html b/emencia/django/newsletter/templates/newsletter/AutomaticEmail_v2.html index 633ee3ae..f50cf414 100644 --- a/emencia/django/newsletter/templates/newsletter/AutomaticEmail_v2.html +++ b/emencia/django/newsletter/templates/newsletter/AutomaticEmail_v2.html @@ -340,8 +340,7 @@ - {# TODO: Подставить href в ссылку #} - {% trans "подробнее" %} + {% trans "подробнее" %} @@ -463,7 +462,6 @@ - {# TODO: Сделать картинку 170х170 #} @@ -490,8 +488,7 @@ - {# TODO: Подставить href в ссылку #} - {% trans "подробнее" %} + {% trans "подробнее" %} diff --git a/templates/client/accounts/mailing_settings.html b/templates/client/accounts/mailing_settings.html index ee87cf92..d9743479 100644 --- a/templates/client/accounts/mailing_settings.html +++ b/templates/client/accounts/mailing_settings.html @@ -158,7 +158,7 @@
- {% trans 'Не хочу быть в курсе событий (отписаться от всего)' %} + {% trans 'Не хочу быть в курсе событий (отписаться от всего)' %}
@@ -179,7 +179,7 @@ {% include 'client/popups/mailing_settings_countries.html' %} - {% if not object.subscriber %} + {% if unsubscribe_success or unsubscribed %}
{% include 'client/popups/unsubscribed.html' %}
diff --git a/templates/client/popups/unsubscribed.html b/templates/client/popups/unsubscribed.html index b8201f5c..c21f7a12 100644 --- a/templates/client/popups/unsubscribed.html +++ b/templates/client/popups/unsubscribed.html @@ -4,11 +4,15 @@