From eac8f2a2f9074dfe62aebeb20e8d0baf08b0bffc Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 22 Mar 2020 11:20:36 -0700 Subject: [PATCH] Include register form in return login page in case of wrong password --- fedireads/view_actions.py | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/fedireads/view_actions.py b/fedireads/view_actions.py index 8405b507e..dd73ca28c 100644 --- a/fedireads/view_actions.py +++ b/fedireads/view_actions.py @@ -16,18 +16,27 @@ def user_login(request): if request.method == 'GET': return redirect('/login') - form = forms.LoginForm(request.POST) - if not form.is_valid(): - return TemplateResponse(request, 'login.html', {'login_form': form}) + register_form = forms.RegisterForm() + login_form = forms.LoginForm(request.POST) + if not login_form.is_valid(): + return TemplateResponse( + request, + 'login.html', + {'login_form': login_form, 'register_form': register_form} + ) - username = form.data['username'] + username = login_form.data['username'] username = '%s@%s' % (username, DOMAIN) - password = form.data['password'] + password = login_form.data['password'] user = authenticate(request, username=username, password=password) if user is not None: login(request, user) return redirect(request.GET.get('next', '/')) - return TemplateResponse(request, 'login.html', {'login_form': form}) + return TemplateResponse( + request, + 'login.html', + {'login_form': login_form, 'register_form': register_form} + ) def register(request):