last changes

archilance/settings/base.py

@@ -170,7 +170,7 @@ SOCIAL_AUTH_PIPELINE = (
     'social.pipeline.social_auth.social_user',
     'social.pipeline.user.get_username',
     'users.pipeline.add_email_for_user',
-    'users.pipeline.test_contractor',
+    # 'users.pipeline.test_contractor',
     'social.pipeline.mail.mail_validation',
     'social.pipeline.user.create_user',
     'social.pipeline.social_auth.associate_user',

users/pipeline.py

@@ -11,10 +11,10 @@ def test_contractor(backend,  details, response, is_new=False, *args, **kwargs):
 def add_email_for_user(backend, details, response, is_new=False, *args, **kwargs):
     data = backend.strategy.request_data()
     if details.get('contractor') is None:
-        return render_to_response('add_email_form.html')
-    else:
-        return {'contractor': details.get('contractor')}
-
+        if 'contractor' in kwargs['request']:
+            return {'contractor': kwargs['request']['contractor']}
+        else:
+            return render_to_response('add_email_form.html')
 @partial
 def require_email(strategy, details, user=None, is_new=False, *args, **kwargs):
     if kwargs.get('ajax') or user and user.email:

users/templates/add_email_form.html

@@ -1,5 +1,9 @@
+{% extends 'partials/base.html' %}
+
+{% block content %}
 <h1>Введите свой email</h1>
 <form method="post">
-<input type="text" name="contractor">
+<input type="email" name="contractor">
 <input type="submit" value="Send">
 </form>
+{% endblock %}

users/urls.py

@@ -16,6 +16,7 @@ from .views import (
     # UserInfoListView,
     UserListView,
     # UserView,
+    send_mail_test,
 )
 
 
@@ -31,6 +32,7 @@ urlpatterns = [
     urls.url(r'^contractor-office/(?P<pk>\d+)/$', ContractorOfficeDetailView.as_view(), name='contractor-office'),
     # urls.url(r'^profile/$', UserDetailView.as_view(), name='user-detail'),
     urls.url(r'^$', UserListView.as_view(), name='users_list'),
+    urls.url(r'^test/$', send_mail_test),
     # urls.url(r'^info$', UserInfoListView.as_view(), name='users_info_list'),
     urls.url(r'contractors/$', ContractorListView.as_view(), name='contractor-list'),
     # urls.url(r'^(?P<pk>\d+)/$', UserView.as_view(), name='user_view'),

users/views.py

@@ -14,6 +14,17 @@ from .models import User, ContractorFinancialInfo
 from .mixins import CheckForUserMixin
 from .forms import UserEditForm, ContractorFinancicalInfoForm
 
+from django.http import HttpResponse
+from django.core.mail import send_mail
+
+
+def send_mail_test(request):
+    send_mail(
+        'Subject here',
+        'Here is the message.',
+        'magomed-gadzhiev-1984@mail.ru',
+        ['dagdahzub@mail.ru'], )
+    return HttpResponse("Mail send")
 
 
 class UserListView(ListView):
@@ -90,7 +101,7 @@ class CustomerProfileEditView(CheckForUserMixin, View):
         instance = get_object_or_404(User, pk=request.user.pk)
         form = self.form_class(instance=instance)
         nodes = Specialization.objects.all()
-        return render(request,self.template_name, {'form': form , 'nodes': nodes})
+        return render(request, self.template_name, {'form': form, 'nodes': nodes})
 
     def post(self, request, *args, **kwargs):
         instance = request.user
@@ -110,10 +121,10 @@ class ContractorProfileEditView(CheckForUserMixin, View):
     def get(self, request, *args, **kwargs):
         instance = get_object_or_404(User, pk=request.user.pk)
         form = self.form_class(instance=instance)
-        root = get_or_none(Specialization,name='_root')
+        root = get_or_none(Specialization, name='_root')
         nodes = root.get_descendants('lft')
 
-        return render(request,self.template_name, {'form': form , 'nodes': nodes})
+        return render(request, self.template_name, {'form': form, 'nodes': nodes})
 
     def post(self, request, *args, **kwargs):
         instance = request.user
@@ -148,5 +159,4 @@ class ContractorFinancialInfoEdit(CheckForUserMixin, View):
             messages.info(request, 'Данные успешно отредактированы')
             return redirect(reverse('users:contractor-financical', kwargs={'pk': request.user.pk}))
 
-        return render(request, self.template_name,{'form': form})
-
+        return render(request, self.template_name, {'form': form})