yul
/
bookwyrm-mastodon
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Include register form in return login page 

in case of wrong password
This commit is contained in:
Mouse Reeve 2020-03-22 11:20:36 -07:00
parent 3a0a87bee0
commit eac8f2a2f9
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
fedireads/view_actions.py
View File

@ -16,18 +16,27 @@ def user_login(request):
if request.method == 'GET': if request.method == 'GET':
return redirect('/login') return redirect('/login')
form = forms.LoginForm(request.POST) register_form = forms.RegisterForm()
if not form.is_valid(): login_form = forms.LoginForm(request.POST)
return TemplateResponse(request, 'login.html', {'login_form': form}) 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) username = '%s@%s' % (username, DOMAIN)
password = form.data['password'] password = login_form.data['password']
user = authenticate(request, username=username, password=password) user = authenticate(request, username=username, password=password)
if user is not None: if user is not None:
login(request, user) login(request, user)
return redirect(request.GET.get('next', '/')) 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): def register(request):