Merge branch 'feature/logined-landing-registration' into 'master'

Если пользователь залогинен на лендинге, то кидать его дальше

See merge request lilschool/site!426
remotes/origin/feature/new-certs-1-10-19
Danil 6 years ago
commit d5cab63385
  1. 5
      apps/auth/views.py

@ -248,6 +248,7 @@ class FacebookLoginOrRegistration(View):
class LandingRegistrationView(View): class LandingRegistrationView(View):
def post(self, request, *args, **kwargs): def post(self, request, *args, **kwargs):
free_lesson_url = 'https://lil.school/p/free-lesson'
form = LandingRegistrationForm(request.POST) form = LandingRegistrationForm(request.POST)
if not form.is_valid(): if not form.is_valid():
return HttpResponse(form.errors.as_text()) return HttpResponse(form.errors.as_text())
@ -258,7 +259,7 @@ class LandingRegistrationView(View):
if User.objects.filter(email=email).count(): if User.objects.filter(email=email).count():
if request.user.is_authenticated and request.user.email == email: if request.user.is_authenticated and request.user.email == email:
return redirect('/') return redirect(free_lesson_url)
return redirect('/p/user-exists') return redirect('/p/user-exists')
user = User( user = User(
@ -276,7 +277,7 @@ class LandingRegistrationView(View):
verification_token = verification_email_token.make_token(user) verification_token = verification_email_token.make_token(user)
url = 'https://%s%s?%s' % (settings.MAIN_HOST, url = 'https://%s%s?%s' % (settings.MAIN_HOST,
reverse_lazy('lilcity:verification-email', args=[verification_token, user.id]), reverse_lazy('lilcity:verification-email', args=[verification_token, user.id]),
urlencode({'next': 'https://lil.school/p/free-lesson'})) urlencode({'next': free_lesson_url}))
try: try:
send_email('Регистрация в Lil School', email, "notification/email/landing_registration.html", url=url, send_email('Регистрация в Lil School', email, "notification/email/landing_registration.html", url=url,
user=user, password=password) user=user, password=password)

Loading…
Cancel
Save