summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--core/views/signup.py21
-rw-r--r--templates/login/signup.html2
2 files changed, 16 insertions, 7 deletions
diff --git a/core/views/signup.py b/core/views/signup.py
index 16b59e3..04e7539 100644
--- a/core/views/signup.py
+++ b/core/views/signup.py
@@ -55,21 +55,30 @@ def signup(request):
The user must be logged-on as a personal login and that is
who is being signed up. You can't signup someone else.
"""
+ form_read_only = True # default
signup_user = request.user
identified_login = is_identified_user(signup_user)
if identified_login:
editor = get_git_string(signup_user)
+ form_read_only = False
else:
- return HttpResponseRedirect("/accounts/login/")
+ get_cookie(request) # might be blank
+ # No, just make the form read-only.
+ # return HttpResponseRedirect("/accounts/login/")
- people = Person.objects.filter(user=signup_user)
- if len(people) == 1:
- signup_person = people[0]
+ if signup_user.is_anonymous:
+ experience = 0
else:
- return HttpResponseRedirect("/accounts/login")
+ people = Person.objects.filter(user=signup_user)
+ if len(people) == 1:
+ signup_person = people[0]
+ form_read_only = False
+ # else:
+ # No, just make the form read-only.
+ # return HttpResponseRedirect("/accounts/login")
- experience = how_many_previous_expos(signup_person)
+ experience = how_many_previous_expos(signup_person)
if request.method == "POST": # If the form has been submitted...
pageform = ExpoSignupForm(request.POST) # A form bound to the POST data
diff --git a/templates/login/signup.html b/templates/login/signup.html
index 815c2ec..fbbf444 100644
--- a/templates/login/signup.html
+++ b/templates/login/signup.html
@@ -126,7 +126,7 @@ Loser Expo {{year}} SIGN-UP Form
</table>
<table border="0">
<h3>Tents</h3>
- <p>There will be two high camps in {{year}}:</p>
+ <p>There will be at least one high camps in {{year}}:</p>
<ul style="list-style: disc">
<li>the Stone Bridge site;</li>
<li>the Garlic Cave site</li>