@@ -548,13 +548,13 @@ class LoginForm(formencode.Schema):
messages={
'empty': _('Please enter a login'),
'tooShort': _('Enter a value %(min)i characters long or more')}
)
password = UnicodeString(
strip=True,
strip=False,
min=3,
not_empty=True,
'empty': _('Please enter a password'),
'tooShort': _('Enter %(min)i characters or more')}
@@ -568,19 +568,19 @@ def UserForm(edit=False, old_data={}):
class _UserForm(formencode.Schema):
allow_extra_fields = True
filter_extra_fields = True
username = All(UnicodeString(strip=True, min=1, not_empty=True),
ValidUsername(edit, old_data))
if edit:
new_password = All(UnicodeString(strip=True, min=6, not_empty=False))
password_confirmation = All(UnicodeString(strip=True, min=6,
new_password = All(UnicodeString(strip=False, min=6, not_empty=False))
password_confirmation = All(UnicodeString(strip=False, min=6,
not_empty=False))
admin = StringBoolean(if_missing=False)
else:
password = All(UnicodeString(strip=True, min=6, not_empty=True))
password = All(UnicodeString(strip=False, min=6, not_empty=True))
active = StringBoolean(if_missing=False)
name = UnicodeString(strip=True, min=1, not_empty=False)
lastname = UnicodeString(strip=True, min=1, not_empty=False)
email = All(Email(not_empty=True), UniqSystemEmail(old_data))
@@ -629,14 +629,14 @@ def ReposGroupForm(edit=False, old_data=
def RegisterForm(edit=False, old_data={}):
class _RegisterForm(formencode.Schema):
username = All(ValidUsername(edit, old_data),
UnicodeString(strip=True, min=1, not_empty=True))
password_confirmation = All(UnicodeString(strip=True, min=6, not_empty=True))
password_confirmation = All(UnicodeString(strip=False, min=6, not_empty=True))
chained_validators = [ValidPasswordsMatch, ValidPassword]
Status change: