forked from enviPath/enviPy
minor
This commit is contained in:
@ -90,6 +90,7 @@ def login(request):
|
||||
if username != request.POST.get("username"):
|
||||
context["message"] = "Login failed!"
|
||||
return render(request, "static/login.html", context)
|
||||
|
||||
password = request.POST.get("password")
|
||||
|
||||
# Get email for username and check if the account is active
|
||||
@ -104,6 +105,7 @@ def login(request):
|
||||
except get_user_model().DoesNotExist:
|
||||
context["message"] = "Login failed!"
|
||||
return render(request, "static/login.html", context)
|
||||
|
||||
try:
|
||||
user = authenticate(username=email, password=password)
|
||||
except Exception:
|
||||
@ -144,8 +146,10 @@ def register(request):
|
||||
# Redirect to unified login page with signup tab
|
||||
next_url = request.GET.get("next", "")
|
||||
redirect_url = reverse("login") + "#signup"
|
||||
|
||||
if next_url:
|
||||
redirect_url += f"?next={next_url}"
|
||||
|
||||
return redirect(redirect_url)
|
||||
elif request.method == "POST":
|
||||
context["title"] = "enviPath"
|
||||
@ -159,18 +163,18 @@ def register(request):
|
||||
|
||||
if not (username and email and password):
|
||||
context["message"] = "Invalid username/email/password"
|
||||
return render(request, "static/register.html", context)
|
||||
return render(request, "static/login.html", context)
|
||||
|
||||
if password != rpassword or password == "":
|
||||
context["message"] = "Registration failed, provided passwords differ!"
|
||||
return render(request, "static/register.html", context)
|
||||
return render(request, "static/login.html", context)
|
||||
|
||||
try:
|
||||
u = UserManager.create_user(username, email, password)
|
||||
logger.info(f"Created user {u.username} ({u.pk})")
|
||||
except Exception:
|
||||
context["message"] = "Registration failed! Couldn't create User Account."
|
||||
return render(request, "static/register.html", context)
|
||||
return render(request, "static/login.html", context)
|
||||
|
||||
if s.ADMIN_APPROVAL_REQUIRED:
|
||||
context["success_message"] = (
|
||||
|
||||
Reference in New Issue
Block a user