m

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:

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.

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())],

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():

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':

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',

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'

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'

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'

templates/client/includes/conference/conference_partner.html

@@ -151,11 +151,12 @@
                 {% endif %}
             </div>
         </div>
+        <p><a href="#pw-event-news-subscribe" class="button icon-up pw-open" >{% trans 'Подписаться на новости' %}</a>    <i>{% blocktrans %}Получайте актуальную информацию о концеренции {{ event.name|safe }} на свой email{% endblocktrans %}</i></p>
 
         <hr>
 
 {#        {% 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 %}
 
         <hr>
 
@@ -271,7 +272,7 @@
 
 
         {% if event.get_photos %}
-            {% with photos=event.get_photos|slice:"5" %}
+            {% with photos=event.get_photos %}
                 <div class="i-photo-slides conference_slider">
                     <h2>{% trans 'Фотографии с прошлой конференции' %}</h2>
 
@@ -333,7 +334,6 @@
                         <div class="im-title">{% trans 'Спикеры' %}</div>
                         <p>{% trans 'Разместите информацию о ключевых спикерах' %}</p>
                         <p><a href="#pw-advertise" class="button icon-up pw-open" >{% trans 'Рекламировать спикера' %}</a></p>
-                        <p><a href="#pw-event-news-subscribe" class="button icon-up pw-open" >{% trans 'Подписаться на новости' %}</a></p>
                     </header>
                 {% endif %}
             {% endwith %}

templates/registration/acquire_email.html

@@ -23,6 +23,7 @@
                     <span class="help-inline">{{  field.errors }}</span>
                 </div>
             </div>
+            {% if not forloop.last %}<br>{% endif %}
         {% endfor %}
         <button class="btn" type="submit">{% trans "Подтвердить" %}</button>
     </form>

templates/registration/social_registration_complete.html

@@ -4,6 +4,7 @@
 {% block title %}{% trans "Registration complete" %}{% endblock %}
 
 {% block page_body %}
-<h1>{% trans "Check your email" %}</h1>
-<p>{% trans "An activation link has been sent to the email address you supplied, along with instructions for activating your account." %}</p>
+<h1>{% trans "Проверьте Ваш email" %}</h1>
+<p>{% trans "Мы отправили ссылку для активации на email который Вы указали, активируйте Ваш аккаунт перейдя по ссылке." %}</p>
+{#<p>{% trans "An activation link has been sent to the email address you supplied, along with instructions for activating your account." %}</p>#}
 {% endblock %}