diff --git a/archilance/settings/base.py b/archilance/settings/base.py index 74a36c2..01a76d4 100644 --- a/archilance/settings/base.py +++ b/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', diff --git a/users/pipeline.py b/users/pipeline.py index b751fc3..ce13c26 100644 --- a/users/pipeline.py +++ b/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: diff --git a/users/templates/add_email_form.html b/users/templates/add_email_form.html index c279603..46d51c9 100644 --- a/users/templates/add_email_form.html +++ b/users/templates/add_email_form.html @@ -1,5 +1,9 @@ +{% extends 'partials/base.html' %} + +{% block content %}

Введите свой email

- +
+{% endblock %} diff --git a/users/urls.py b/users/urls.py index d12a052..1c6ed27 100755 --- a/users/urls.py +++ b/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\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\d+)/$', UserView.as_view(), name='user_view'), diff --git a/users/views.py b/users/views.py index 05f48f9..70d64ef 100644 --- a/users/views.py +++ b/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})