summaryrefslogtreecommitdiffstats
path: root/core/views/signup.py
diff options
context:
space:
mode:
Diffstat (limited to 'core/views/signup.py')
-rw-r--r--core/views/signup.py19
1 files changed, 11 insertions, 8 deletions
diff --git a/core/views/signup.py b/core/views/signup.py
index c0360f9..8026eac 100644
--- a/core/views/signup.py
+++ b/core/views/signup.py
@@ -3,7 +3,6 @@ import re
from pathlib import Path
import django.forms as forms
-from django.contrib.auth.decorators import login_required
from django.http import HttpResponse, HttpResponseRedirect
from django.shortcuts import redirect, render
from django.urls import reverse
@@ -25,11 +24,15 @@ from troggle.core.views.editor_helpers import HTMLarea
"""
@ensure_csrf_cookie
-@login_required
def signup(request):
- if request.user.username in ["expo", "expoadmin"]:
- return redirect("/accounts/newregister/")
- # /accounts/login/?next=/signup
+ current_user = request.user
+
+ personal_login = True
+ if current_user.is_anonymous:
+ personal_login = False
+ elif current_user.username in ["expo", "expoadmin"]:
+ personal_login = False
+
if request.method == "POST": # If the form has been submitted...
pageform = ExpoSignupForm(request.POST) # A form bound to the POST data
if pageform.is_valid():
@@ -39,8 +42,8 @@ def signup(request):
print(f"{who=}")
return render(
request,
- "signup.html",
- {"form": pageform,
+ "login/signup.html",
+ {"form": pageform, "personal_login": personal_login,
"year": "2025", "dates": "30th June - 3rd August",
}
)
@@ -55,7 +58,7 @@ def signup(request):
})
return render(
request,
- "signup.html",
+ "login/signup.html",
{"form": pageform,
"year": "2025", "dates": "30th June - 3rd August",
},