summaryrefslogtreecommitdiffstats
path: root/registration
diff options
context:
space:
mode:
Diffstat (limited to 'registration')
-rw-r--r--registration/forms.py11
-rw-r--r--registration/views.py8
2 files changed, 6 insertions, 13 deletions
diff --git a/registration/forms.py b/registration/forms.py
index 2f591d4..ad00187 100644
--- a/registration/forms.py
+++ b/registration/forms.py
@@ -15,6 +15,7 @@ from registration.models import RegistrationProfile
# on them with CSS or JavaScript if they have a class of "required"
# in the HTML. Your mileage may vary. If/when Django ticket #3515
# lands in trunk, this will no longer be necessary.
+# This was fixed in 2007, so I guess we don't need this any more. [W]
attrs_dict = { 'class': 'required' }
@@ -22,8 +23,7 @@ class RegistrationForm(forms.Form):
"""
Form for registering a new user account.
- Validates that the requested username is not already in use, and
- requires the password to be entered twice to catch typos.
+ Validates that the requested username is not already in use.
Subclasses should feel free to add any additional validation they
need, but should either preserve the base ``save()`` or implement
@@ -39,8 +39,7 @@ class RegistrationForm(forms.Form):
label=_(u'email address'))
password1 = forms.CharField(widget=forms.PasswordInput(attrs=attrs_dict, render_value=False),
label=_(u'password'))
- password2 = forms.CharField(widget=forms.PasswordInput(attrs=attrs_dict, render_value=False),
- label=_(u'password (again)'))
+
def clean_username(self):
"""
@@ -62,9 +61,7 @@ class RegistrationForm(forms.Form):
field.
"""
- if 'password1' in self.cleaned_data and 'password2' in self.cleaned_data:
- if self.cleaned_data['password1'] != self.cleaned_data['password2']:
- raise forms.ValidationError(_(u'You must type the same password each time'))
+ if 'password1' in self.cleaned_data:
if len(self.cleaned_data['password1']) < 6:
raise forms.ValidationError(_(u'Your password must be at least 6 characters'))
return self.cleaned_data
diff --git a/registration/views.py b/registration/views.py
index 5df17b4..8228fa9 100644
--- a/registration/views.py
+++ b/registration/views.py
@@ -13,7 +13,6 @@ from django.shortcuts import render_to_response
from django.template import RequestContext
from django.contrib.auth import login
-
from registration.forms import RegistrationForm
from registration.models import RegistrationProfile
@@ -69,7 +68,6 @@ def activate(request, activation_key,
c = {}
c.update(csrf(request))
-
activation_key = activation_key.lower() # Normalize before trying anything with it.
account = RegistrationProfile.objects.activate_user(activation_key)
try:
@@ -81,11 +79,10 @@ def activate(request, activation_key,
context = RequestContext(request)
for key, value in extra_context.items():
context[key] = callable(value) and value() or value
- # merge local settings dict with csrf token dict and render. (could use render()from django 1.34 onwards)
return render_to_response(template_name,
c.update({ 'account': account,
- 'expiration_days': settings.ACCOUNT_ACTIVATION_DAYS, 'settings':settings, }),
- context_instance=context)
+ 'expiration_days': settings.ACCOUNT_ACTIVATION_DAYS, 'settings':settings}),
+ context_instance=context,)
def register(request, success_url=None,
@@ -168,7 +165,6 @@ def register(request, success_url=None,
context = RequestContext(request)
for key, value in extra_context.items():
context[key] = callable(value) and value() or value
- # merge local settings dict with csrf token dict and render. (could use render()from django 1.34 onwards)
return render_to_response(template_name,
c.update({ 'form': form,'settings':settings }),
context_instance=context)