diff options
| -rw-r--r-- | core/views/user_registration.py | 22 | ||||
| -rw-r--r-- | templates/login/register.html | 8 |
2 files changed, 15 insertions, 15 deletions
diff --git a/core/views/user_registration.py b/core/views/user_registration.py index b17170c..218b593 100644 --- a/core/views/user_registration.py +++ b/core/views/user_registration.py @@ -198,15 +198,12 @@ class newregister_form(forms.Form): # not a model-form, just a form-form cleaned_data = super().clean()
un = cleaned_data.get("fullname")
- # expoers = Person.objects.filter(slug=un)
- # if len(expoers) == 0:
- # raise ValidationError(
- # "Sorry, we are not registering new people yet. Try again next week. We are still getting the bugs out of this.."
- # )
- # if len(expoers) != 1:
- # raise ValidationError(
- # "Sorry, that troggle identifier has duplicates. Contact a nerd on the Nerd email list, or (better) the Matrix website chat."
- # )
+ email = cleaned_data.get("email")
+ users = User.objects.filter(email=email)
+ if len(users) != 0:
+ raise ValidationError(
+ "Duplicate email address. Another registered user is already using this email address. Email addresses must be unique as that is how we reset forgotten passwords."
+ )
class register_form(forms.Form): # not a model-form, just a form-form
username = forms.CharField(strip=True, required=True,
@@ -258,4 +255,9 @@ class register_form(forms.Form): # not a model-form, just a form-form raise ValidationError(
"Sorry, that troggle identifier has duplicates. Contact a nerd on the Nerd email list, or (better) the Matrix website chat."
)
-
\ No newline at end of file + email = cleaned_data.get("email")
+ users = User.objects.filter(email=email)
+ if len(users) != 0:
+ raise ValidationError(
+ "Duplicate email address. Another registered user is already using this email address. Email addresses must be unique as that is how we reset forgotten passwords."
+ )
\ No newline at end of file diff --git a/templates/login/register.html b/templates/login/register.html index c7b4702..8f6409c 100644 --- a/templates/login/register.html +++ b/templates/login/register.html @@ -138,11 +138,9 @@ where it is accessible only to the database administrators. There is no troggle which publishes your email address. For permanent storage all email addresses are encrypted. Your real name and troggle username is public however, and we do not have anonymous people attending expo. -<p>The password we -{% if newuser %}will be{% else %}are{%endif %} -asking for is used only to log on to troggle to keep track of -who is editing the current expo records, website content, historic survey data and -when using the expo kanban software. It is not the same as the password to access your email +<p> +The password we {% if newuser %}will be{% else %}are{%endif %} asking for is solely for logging into troggle. +The troggle login is used to track who is editing the current and past expo data, website content, and historic survey data, as well as for accessing the expo Kanban software. It is not the same as the password you use to access your email with your email provider and it is not the same as the password you use to interact with the expo <a href="https://lists.wookware.org/cgi-bin/mailman/roster/expo">email list</a>. |