From fdd510869d1ca98cf29af146dd12d298bc019005 Mon Sep 17 00:00:00 2001 From: ya_dim4ik Date: Thu, 16 Feb 2017 16:20:56 +0200 Subject: [PATCH 1/2] fix newsletter --- apps/emencia/django/newsletter/views/expo_views.py | 7 +++---- static/mailing_settings/css/main.css | 1 - 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/apps/emencia/django/newsletter/views/expo_views.py b/apps/emencia/django/newsletter/views/expo_views.py index b9868aad..e964a3ad 100644 --- a/apps/emencia/django/newsletter/views/expo_views.py +++ b/apps/emencia/django/newsletter/views/expo_views.py @@ -42,10 +42,9 @@ class SubscribeView(GetUserMixin, FormView): contact.send_activation() if self.request.is_ajax(): - data = { - 'success': True, - 'redirect_url': str(self.get_success_url()) - } + data = {'success': True} + if self.request.GET.get('save'): + data['redirect_url'] = str(self.get_success_url()) return JsonResponse(data) return redirect(self.get_success_url()) diff --git a/static/mailing_settings/css/main.css b/static/mailing_settings/css/main.css index 7d8ab736..8f7f887d 100644 --- a/static/mailing_settings/css/main.css +++ b/static/mailing_settings/css/main.css @@ -882,7 +882,6 @@ a.themes_trigger{ } .pr-form input { - padding:0; border:none; color:#000; font:17px/21px 'pf_dindisplay_promedium', Arial, Helvetica, sans-serif; From accc5607ecb08ba8bf5075d154491343335dcb8a Mon Sep 17 00:00:00 2001 From: ya_dim4ik Date: Thu, 16 Feb 2017 17:07:05 +0200 Subject: [PATCH 2/2] =?UTF-8?q?=D1=81=D0=BC=D0=B5=D0=BD=D0=B8=D0=BB=20?= =?UTF-8?q?=D1=82=D0=B8=D0=BF=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA?= =?UTF-8?q?=D0=B8=20=D0=B8=D0=BB=D0=B8=20=D1=81=D0=BE=D1=85=D1=80=D0=B0?= =?UTF-8?q?=D0=BD=D1=8F=D1=82=D1=8C=20=D1=84=D0=BE=D1=80=D0=BC=D1=83=20?= =?UTF-8?q?=D0=BF=D0=BE=D0=B4=D0=BF=D0=B8=D1=81=D0=BA=D0=B8=20=D1=80=D0=B0?= =?UTF-8?q?=D1=81=D1=81=D1=8B=D0=BB=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/emencia/django/newsletter/views/expo_views.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/emencia/django/newsletter/views/expo_views.py b/apps/emencia/django/newsletter/views/expo_views.py index e964a3ad..5fb65276 100644 --- a/apps/emencia/django/newsletter/views/expo_views.py +++ b/apps/emencia/django/newsletter/views/expo_views.py @@ -36,14 +36,14 @@ class SubscribeView(GetUserMixin, FormView): return super(SubscribeView, self).post(request, *args, **kwargs) def form_valid(self, form): - if self.request.GET.get('save'): + if self.request.POST.get('save'): contact = form.save() if not self.request.user.is_authenticated(): contact.send_activation() if self.request.is_ajax(): data = {'success': True} - if self.request.GET.get('save'): + if self.request.POST.get('save'): data['redirect_url'] = str(self.get_success_url()) return JsonResponse(data)