From cef8eaf4c7b39dec6c26f0627f9ce223ca3dca30 Mon Sep 17 00:00:00 2001 From: Alexander Burdeinyi Date: Fri, 16 Dec 2016 20:57:58 +0200 Subject: [PATCH] m --- accounts/forms.py | 6 +++--- accounts/models.py | 8 ++++++++ emencia/django/newsletter/forms.py | 8 ++++++++ events/views.py | 14 +++++++++----- proj/middleware.py | 6 ++---- service/views.py | 5 +---- support/d_dev/settings.py | 8 ++++---- support/dev/settings.py | 8 ++++---- support/prod/settings.py | 8 ++++---- .../includes/conference/conference_partner.html | 6 +++--- templates/registration/acquire_email.html | 1 + .../registration/social_registration_complete.html | 5 +++-- 12 files changed, 50 insertions(+), 33 deletions(-) diff --git a/accounts/forms.py b/accounts/forms.py index edd06042..f988485f 100644 --- a/accounts/forms.py +++ b/accounts/forms.py @@ -286,10 +286,10 @@ class SocialRegistrationCompleteForm(RegistrationCompleteForm): def save(self, force_insert=False, force_update=False, commit=True): email = self.cleaned_data['email'] - print(email, 'blablabla') - if User.objects.filter(email=email).exists(): + # print(email, 'blablabla') + if User.objects.filter(email__iexact=email).exists(): # pass to the view user, that had account before - user = User.objects.get(email=email) + user = User.objects.get(email__iexact=email) # social = UserSocialAuth.objects.get(user=self.instance) # social.user = user # that cause AuthAlreadyAssociated error! else: diff --git a/accounts/models.py b/accounts/models.py index 1e4f4dee..983a98f5 100644 --- a/accounts/models.py +++ b/accounts/models.py @@ -133,6 +133,14 @@ class User(AbstractBaseUser, PermissionsMixin, GetURLorPK): class Meta: ordering = ['-rating'] + def get_user_log(self): + try: + log, created = UserLog.objects.get_or_create(user_id=self.pk) + except (UserLog.MultipleObjectsReturned, ): + log = UserLog.objects.filter(user_id=self.pk)[0] + return log + + def get_full_name(self): """ Returns the first_name plus the last_name, with a space in between. diff --git a/emencia/django/newsletter/forms.py b/emencia/django/newsletter/forms.py index 6b9f66de..2b84c00d 100644 --- a/emencia/django/newsletter/forms.py +++ b/emencia/django/newsletter/forms.py @@ -218,6 +218,14 @@ class ContactForm(forms.ModelForm): name = self.cleaned_data['first_name'] return name.capitalize() + def clean_email(self): + email = self.cleaned_data['email'] + try: + self.instance = Contact.objects.get(email__iexact=email) + return email + except (Contact.DoesNotExist, ): + return email + class ContactSettingsForm(forms.ModelForm): theme = forms.MultipleChoiceField(choices=[(str(item.id), item.name) for item in list(Theme.objects.language().all())], diff --git a/events/views.py b/events/views.py index 094c1272..cc611908 100644 --- a/events/views.py +++ b/events/views.py @@ -131,7 +131,7 @@ class SubscribeView(FormView): Returns the keyword arguments for instantiating the form. """ kwargs = super(SubscribeView, self).get_form_kwargs() - kwargs.update({'instance': self.object}) + # kwargs.update({'instance': self.object}) return kwargs def dispatch(self, request, *args, **kwargs): @@ -143,6 +143,7 @@ class SubscribeView(FormView): self.event = self.get_event() except ObjectDoesNotExist: return HttpResponseNotFound() + self._redirect_url = self.event.get_absolute_url() return super(SubscribeView, self).dispatch(request, *args, **kwargs) def form_invalid(self, form): @@ -150,14 +151,17 @@ class SubscribeView(FormView): def form_valid(self, form): contact = form.save(commit=False) - contact.dailymailing = False - contact.save() - contact.send_activation() + if not contact.pk: + contact.dailymailing = False + contact.save() + contact.send_activation() + self._redirect_url = self.redirect_url + self.contact = contact return self.success_responce(sent=True) def success_responce(self, sent=False): self.set_event() - return JsonResponse({'success': True, 'sent': sent, 'redirect_url': str(self.redirect_url)}) + return JsonResponse({'success': True, 'sent': sent, 'redirect_url': str(self._redirect_url)}) def post(self, request, *args, **kwargs): if request.user.is_authenticated(): diff --git a/proj/middleware.py b/proj/middleware.py index 15b61b69..831abbac 100644 --- a/proj/middleware.py +++ b/proj/middleware.py @@ -46,11 +46,9 @@ class Referer(object): 'search': request.GET.get('q'), } if any(data_exists.values()): - user = request.user - authenticated = request.user.is_authenticated() userlog = None - if authenticated: - userlog, created = UserLog.objects.get_or_create(user_id=user.pk) + if request.user.is_authenticated(): + userlog = request.user.get_user_log() for key, val in data_exists.iteritems(): if val: if key == 'search': diff --git a/service/views.py b/service/views.py index 614facfd..979245e1 100644 --- a/service/views.py +++ b/service/views.py @@ -37,10 +37,7 @@ def get_userlog_data(request): userlog = None data = {} if request.user.is_authenticated(): - try: - userlog = UserLog.objects.get(pk=request.user.pk) - except: - pass + userlog = request.user.get_user_log() attrs = [ 'referer1', 'referer2', 'utm_source1', 'utm_medium1', 'utm_campaign1', 'utm_source2', 'utm_medium2', 'utm_campaign2', diff --git a/support/d_dev/settings.py b/support/d_dev/settings.py index 12bb23ba..769b7572 100644 --- a/support/d_dev/settings.py +++ b/support/d_dev/settings.py @@ -305,10 +305,10 @@ SOCIAL_AUTH_MAILRU_OAUTH2_KEY = '697945' SOCIAL_AUTH_MAILRU_OAUTH2_SECRET = '343581b9e31961b334532cc1880066e8' SOCIAL_AUTH_MAILRU_OAUTH2_SCOPE = ['email'] -SOCIAL_AUTH_ODNOKLASSNIKI_OAUTH2_KEY = 'CBAQDCKIABABABABA' -SOCIAL_AUTH_ODNOKLASSNIKI_OAUTH2_SECRET = '814CDDCD3E2D2F278EF1591B' -SOCIAL_AUTH_ODNOKLASSNIKI_OAUTH2_PUBLIC_NAME = '128007936' -SOCIAL_AUTH_ODNOKLASSNIKI_OAUTH2_PUBLIC_SCOPE = ['email'] +SOCIAL_AUTH_ODNOKLASSNIKI_OAUTH2_KEY = '1249032192' +SOCIAL_AUTH_ODNOKLASSNIKI_OAUTH2_SECRET = '87A7A1B964D2C73B9861BF76' +SOCIAL_AUTH_ODNOKLASSNIKI_OAUTH2_PUBLIC_NAME = 'CBAJLDHLEBABABABA' +SOCIAL_AUTH_ODNOKLASSNIKI_OAUTH2_SCOPE = ['GET_EMAIL'] SOCIAL_AUTH_LINKEDIN_KEY = 'jt9xwquj1fkd' SOCIAL_AUTH_LINKEDIN_SECRET = 'GvM2xQCNADaBfiMy' diff --git a/support/dev/settings.py b/support/dev/settings.py index 4f1294cf..32bd949c 100644 --- a/support/dev/settings.py +++ b/support/dev/settings.py @@ -303,10 +303,10 @@ SOCIAL_AUTH_MAILRU_OAUTH2_KEY = '697945' SOCIAL_AUTH_MAILRU_OAUTH2_SECRET = '343581b9e31961b334532cc1880066e8' SOCIAL_AUTH_MAILRU_OAUTH2_SCOPE = ['email'] -SOCIAL_AUTH_ODNOKLASSNIKI_OAUTH2_KEY = 'CBAQDCKIABABABABA' -SOCIAL_AUTH_ODNOKLASSNIKI_OAUTH2_SECRET = '814CDDCD3E2D2F278EF1591B' -SOCIAL_AUTH_ODNOKLASSNIKI_OAUTH2_PUBLIC_NAME = '128007936' -SOCIAL_AUTH_ODNOKLASSNIKI_OAUTH2_PUBLIC_SCOPE = ['email'] +SOCIAL_AUTH_ODNOKLASSNIKI_OAUTH2_KEY = '1249032192' +SOCIAL_AUTH_ODNOKLASSNIKI_OAUTH2_SECRET = '87A7A1B964D2C73B9861BF76' +SOCIAL_AUTH_ODNOKLASSNIKI_OAUTH2_PUBLIC_NAME = 'CBAJLDHLEBABABABA' +SOCIAL_AUTH_ODNOKLASSNIKI_OAUTH2_SCOPE = ['GET_EMAIL'] SOCIAL_AUTH_LINKEDIN_KEY = 'jt9xwquj1fkd' SOCIAL_AUTH_LINKEDIN_SECRET = 'GvM2xQCNADaBfiMy' diff --git a/support/prod/settings.py b/support/prod/settings.py index 17928d28..37e60539 100644 --- a/support/prod/settings.py +++ b/support/prod/settings.py @@ -303,10 +303,10 @@ SOCIAL_AUTH_MAILRU_OAUTH2_KEY = '697945' SOCIAL_AUTH_MAILRU_OAUTH2_SECRET = '343581b9e31961b334532cc1880066e8' SOCIAL_AUTH_MAILRU_OAUTH2_SCOPE = ['email'] -SOCIAL_AUTH_ODNOKLASSNIKI_OAUTH2_KEY = 'CBAQDCKIABABABABA' -SOCIAL_AUTH_ODNOKLASSNIKI_OAUTH2_SECRET = '814CDDCD3E2D2F278EF1591B' -SOCIAL_AUTH_ODNOKLASSNIKI_OAUTH2_PUBLIC_NAME = '128007936' -SOCIAL_AUTH_ODNOKLASSNIKI_OAUTH2_PUBLIC_SCOPE = ['email'] +SOCIAL_AUTH_ODNOKLASSNIKI_OAUTH2_KEY = '1249032192' +SOCIAL_AUTH_ODNOKLASSNIKI_OAUTH2_SECRET = '87A7A1B964D2C73B9861BF76' +SOCIAL_AUTH_ODNOKLASSNIKI_OAUTH2_PUBLIC_NAME = 'CBAJLDHLEBABABABA' +SOCIAL_AUTH_ODNOKLASSNIKI_OAUTH2_SCOPE = ['GET_EMAIL'] SOCIAL_AUTH_LINKEDIN_KEY = 'jt9xwquj1fkd' SOCIAL_AUTH_LINKEDIN_SECRET = 'GvM2xQCNADaBfiMy' diff --git a/templates/client/includes/conference/conference_partner.html b/templates/client/includes/conference/conference_partner.html index febdb6fb..b84b0b54 100644 --- a/templates/client/includes/conference/conference_partner.html +++ b/templates/client/includes/conference/conference_partner.html @@ -151,11 +151,12 @@ {% endif %} +

{% trans 'Подписаться на новости' %} {% blocktrans %}Получайте актуальную информацию о концеренции {{ event.name|safe }} на свой email{% endblocktrans %}

{# {% include 'client/includes/conference/conference_services.html' with event=event %}#} - {% include 'includes/event_steps.html' with event=event %} + {% include 'client/includes/event_steps.html' with event=event %}
@@ -271,7 +272,7 @@ {% if event.get_photos %} - {% with photos=event.get_photos|slice:"5" %} + {% with photos=event.get_photos %}

{% trans 'Фотографии с прошлой конференции' %}

@@ -333,7 +334,6 @@
{% trans 'Спикеры' %}

{% trans 'Разместите информацию о ключевых спикерах' %}

{% trans 'Рекламировать спикера' %}

-

{% trans 'Подписаться на новости' %}

{% endif %} {% endwith %} diff --git a/templates/registration/acquire_email.html b/templates/registration/acquire_email.html index b25d6a33..8b57e680 100644 --- a/templates/registration/acquire_email.html +++ b/templates/registration/acquire_email.html @@ -23,6 +23,7 @@ {{ field.errors }}
+ {% if not forloop.last %}
{% endif %} {% endfor %} diff --git a/templates/registration/social_registration_complete.html b/templates/registration/social_registration_complete.html index 877168f2..a3d9edb1 100644 --- a/templates/registration/social_registration_complete.html +++ b/templates/registration/social_registration_complete.html @@ -4,6 +4,7 @@ {% block title %}{% trans "Registration complete" %}{% endblock %} {% block page_body %} -

{% trans "Check your email" %}

-

{% trans "An activation link has been sent to the email address you supplied, along with instructions for activating your account." %}

+

{% trans "Проверьте Ваш email" %}

+

{% trans "Мы отправили ссылку для активации на email который Вы указали, активируйте Ваш аккаунт перейдя по ссылке." %}

+{#

{% trans "An activation link has been sent to the email address you supplied, along with instructions for activating your account." %}

#} {% endblock %}