Fix OSQA 269, User messages in new admin don't seem to link properly.

[osqa.git] / forum / utils / forms.py

diff --git a/forum/utils/forms.py b/forum/utils/forms.py
index c54056cafc948f1c961bb2f042f2aa0fd16d3d63..1becdf0edd52c648520c32394380bb3ff50dfd47 100644 (file)
--- a/forum/utils/forms.py
+++ b/forum/utils/forms.py
@@ -2,9 +2,9 @@ from django import forms
 import re
 from django.utils.translation import ugettext as _
 from django.utils.safestring import mark_safe
-from django.conf import settings
+from forum import settings
 from django.http import str_to_unicode
-from django.contrib.auth.models import User
+from forum.models import User
 import urllib
 
 DEFAULT_NEXT = '/' + getattr(settings, 'FORUM_SCRIPT_ALIAS')
@@ -34,11 +34,9 @@ class NextUrlField(forms.CharField):
         return clean_next(value)
 
 login_form_widget_attrs = { 'class': 'required login' }
-username_re = re.compile(r'^[\w ]+$')
+username_re = re.compile(r'^[\w\s ]+$', re.UNICODE)
 
 class UserNameField(StrippedNonEmptyCharField):
-    RESERVED_NAMES = (u'fuck', u'shit', u'ass', u'sex', u'add',
-                       u'edit', u'save', u'delete', u'manage', u'update', 'remove', 'new')
     def __init__(self,db_model=User, db_field='username', must_exist=False,skip_clean=False,label=_('choose a username'),**kw):
         self.must_exist = must_exist
         self.skip_clean = skip_clean
@@ -50,6 +48,7 @@ class UserNameField(StrippedNonEmptyCharField):
                         'missing':_('sorry, there is no user with this name'),
                         'multiple-taken':_('sorry, we have a serious error - user name is taken by several users'),
                         'invalid':_('user name can only consist of letters, empty space and underscore'),
+                        'toshort':_('user name is to short, please use at least %d characters') % settings.MIN_USERNAME_LENGTH
                     }
         if 'error_messages' in kw:
             error_messages.update(kw['error_messages'])
@@ -72,9 +71,11 @@ class UserNameField(StrippedNonEmptyCharField):
             username = super(UserNameField, self).clean(username)
         except forms.ValidationError:
             raise forms.ValidationError(self.error_messages['required'])
-        if self.required and not username_re.search(username):
+        if len(username) < settings.MIN_USERNAME_LENGTH:
+            raise forms.ValidationError(self.error_messages['toshort'])
+        if self.required and not username_re.match(username):
             raise forms.ValidationError(self.error_messages['invalid'])
-        if username in self.RESERVED_NAMES:
+        if username in settings.RESERVED_USERNAMES:
             raise forms.ValidationError(self.error_messages['forbidden'])
         try:
             user = self.db_model.objects.get(
@@ -115,7 +116,7 @@ class UserEmailField(forms.EmailField):
         if settings.EMAIL_UNIQUE == True:
             try:
                 user = User.objects.get(email = email)
-                raise forms.ValidationError(self.error_messsages['taken'])
+                raise forms.ValidationError(self.error_messages['taken'])
             except User.DoesNotExist:
                 return email
             except User.MultipleObjectsReturned:
@@ -133,6 +134,10 @@ class SetPasswordForm(forms.Form):
                                 error_messages={'required':_('please, retype your password'),
                                                 'nomatch':_('sorry, entered passwords did not match, please try again')},
                                 )
+
+    def __init__(self, data=None, user=None, *args, **kwargs):
+        super(SetPasswordForm, self).__init__(data, *args, **kwargs)
+
     def clean_password2(self):
         """
         Validates that the two password inputs match.