From c39c639d3a0e521e6ea7ba5e64d494f68b4fb18a Mon Sep 17 00:00:00 2001 From: Slava Kyrachevsky Date: Thu, 2 Feb 2017 13:19:12 +0200 Subject: [PATCH] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=20=D0=BE=D1=88=D0=B8?= =?UTF-8?q?=D0=B1=D0=BA=D0=B8=20=D0=BF=D1=80=D0=B8=20=D0=BF=D1=80=D0=BE?= =?UTF-8?q?=D1=81=D0=BC=D0=BE=D1=82=D1=80=D0=B5=20=D0=BD=D0=B0=D1=81=D1=82?= =?UTF-8?q?=D1=80=D0=BE=D0=B5=D0=BA=D1=82=20=D1=80=D0=B0=D1=81=D1=81=D1=8B?= =?UTF-8?q?=D0=BB=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 2 +- apps/accounts/models.py | 1 + apps/accounts/urls.py | 2 +- apps/accounts/views.py | 12 +++++------- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index f622132d..772dc2a0 100644 --- a/Makefile +++ b/Makefile @@ -41,7 +41,7 @@ compilemessages: -@ipython manage.py compilemessages collectstatic: - @ipython manage.py collectstatic --noinput + @ipython manage.py collectstatic user: -@ipython manage.py createsuperuser diff --git a/apps/accounts/models.py b/apps/accounts/models.py index 983a98f5..0d806af6 100644 --- a/apps/accounts/models.py +++ b/apps/accounts/models.py @@ -11,6 +11,7 @@ from django.db.models.loading import get_model from django.db.models.signals import post_save from django.utils import timezone from django.utils.translation import ugettext as _ + from functions.form_check import translit_with_separator from functions.model_mixin import GetURLorPK diff --git a/apps/accounts/urls.py b/apps/accounts/urls.py index eeaf3696..c9842f55 100644 --- a/apps/accounts/urls.py +++ b/apps/accounts/urls.py @@ -21,7 +21,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/$', login_required(MailingSettings.as_view()), name='accounts-mailing_settings'), # 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'), diff --git a/apps/accounts/views.py b/apps/accounts/views.py index 65622297..56bb701b 100644 --- a/apps/accounts/views.py +++ b/apps/accounts/views.py @@ -135,13 +135,11 @@ class MailingSettings(GetUserMixin, ContextMixin, AjaxableResponseMixin, CreateU 'checked_th': list(instance.themes.values_list('pk', flat=True)), 'contact': instance, }) - 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}) + 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):