Browse Source

Fixed validators calls.

Ralfp 12 years ago
parent
commit
5acc45300d
3 changed files with 8 additions and 8 deletions
  1. 4 4
      misago/apps/admin/users/forms.py
  2. 2 2
      misago/apps/register/forms.py
  3. 2 2
      misago/models/usermodel.py

+ 4 - 4
misago/apps/admin/users/forms.py

@@ -80,7 +80,7 @@ class UserForm(Form):
 
     def clean_username(self):
         org_username = self.user.username
-        validate_username(self.cleaned_data['username'], settings)
+        validate_username(self.cleaned_data['username'])
         self.user.set_username(self.cleaned_data['username'])
         try:
             self.user.full_clean()
@@ -99,7 +99,7 @@ class UserForm(Form):
 
     def clean_new_password(self):
         if self.cleaned_data['new_password']:
-            validate_password(self.cleaned_data['new_password'], settings)
+            validate_password(self.cleaned_data['new_password'])
             self.user.set_password(self.cleaned_data['new_password'])
             try:
                 self.user.full_clean()
@@ -157,7 +157,7 @@ class NewUserForm(Form):
         super(NewUserForm, self).__init__(*args, **kwargs)
 
     def clean_username(self):
-        validate_username(self.cleaned_data['username'], settings)
+        validate_username(self.cleaned_data['username'])
         new_user = User.objects.get_blank_user()
         new_user.set_username(self.cleaned_data['username'])
         try:
@@ -182,7 +182,7 @@ class NewUserForm(Form):
             new_user.full_clean()
         except ValidationError as e:
             new_user.is_password_valid(e)
-        validate_password(self.cleaned_data['password'], settings)
+        validate_password(self.cleaned_data['password'])
         return self.cleaned_data['password']
 
 

+ 2 - 2
misago/apps/register/forms.py

@@ -51,7 +51,7 @@ class UserRegisterForm(Form):
             del self.layout[3]
         
     def clean_username(self):
-        validate_username(self.cleaned_data['username'], settings)
+        validate_username(self.cleaned_data['username'])
         new_user = User.objects.get_blank_user()
         new_user.set_username(self.cleaned_data['username'])
         try:
@@ -70,7 +70,7 @@ class UserRegisterForm(Form):
         return self.cleaned_data['email']
         
     def clean_password(self):
-        validate_password(self.cleaned_data['password'], settings)
+        validate_password(self.cleaned_data['password'])
         new_user = User.objects.get_blank_user()
         new_user.set_password(self.cleaned_data['password'])
         try:

+ 2 - 2
misago/models/usermodel.py

@@ -69,8 +69,8 @@ class UserManager(models.Manager):
                         subscribe_reply=settings.subscribe_reply,
                         )
 
-        validate_username(username, settings)
-        validate_password(password, settings)
+        validate_username(username)
+        validate_password(password)
         new_user.set_username(username)
         new_user.set_email(email)
         new_user.set_password(password)