diff options
Diffstat (limited to 'accounts/forms.py')
| -rw-r--r-- | accounts/forms.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/accounts/forms.py b/accounts/forms.py index 2829a9a..ad48ba9 100644 --- a/accounts/forms.py +++ b/accounts/forms.py @@ -3,7 +3,7 @@ import re from flask import current_app, Markup, url_for from flask_wtf import FlaskForm as Form from flask_login import current_user -from wtforms import TextField, PasswordField, ValidationError, BooleanField,\ +from wtforms import StringField, PasswordField, ValidationError, BooleanField,\ validators from wtforms.form import FormMeta from .utils import NotRegexp @@ -14,13 +14,13 @@ USERNAME_EXCLUDE_RE = re.compile(r'^(admin|root)') class RegisterForm(Form): - username = TextField('Benutzername', [ + username = StringField('Benutzername', [ validators.Regexp(USERNAME_RE, message='Benutzername darf nur aus a-z, ' 'Zahlen und - bestehen (2-16 Zeichen, am Anfang nur a-z).'), NotRegexp(USERNAME_EXCLUDE_RE, message='Dieser Benutzername ist nicht erlaubt.'), ]) - mail = TextField('E-Mail-Adresse', [validators.Email(), validators.Length(min=6, max=50)]) - question = TextField('Hauptstadt von Deutschland?', [validators.AnyOf( + mail = StringField('E-Mail-Adresse', [validators.Email(), validators.Length(min=6, max=50)]) + question = StringField('Hauptstadt von Deutschland?', [validators.AnyOf( ('Berlin', 'berlin'), message='Bitte beantworte die Frage.')]) def validate_username(self, field): @@ -61,14 +61,14 @@ class AdminCreateAccountForm(RegisterForm): class RegisterCompleteForm(Form): - password = PasswordField('Passwort', [validators.Required(), + password = PasswordField('Passwort', [validators.DataRequired(), validators.EqualTo('password_confirm', message='Passwörter stimmen nicht überein')]) password_confirm = PasswordField('Passwort bestätigen') # n.b. this form is also used in lost_password_complete class LostPasswordForm(Form): - username_or_mail = TextField('Benutzername oder E-Mail') + username_or_mail = StringField('Benutzername oder E-Mail') user = None def validate_username_or_mail(self, field): @@ -107,7 +107,7 @@ class SettingsForm(Form, metaclass=SettingsMeta): password = PasswordField('Neues Passwort', [validators.Optional(), validators.EqualTo('password_confirm', message='Passwörter stimmen nicht überein')]) password_confirm = PasswordField('Passwort bestätigen') - mail = TextField('E-Mail-Adresse', [validators.Optional(), validators.Email(), validators.Length(min=6, max=50)]) + mail = StringField('E-Mail-Adresse', [validators.Optional(), validators.Email(), validators.Length(min=6, max=50)]) def validate_old_password(self, field): if self.password.data: @@ -133,7 +133,7 @@ class SettingsForm(Form, metaclass=SettingsMeta): class AdminDisableAccountForm(Form): - username = TextField('Benutzername') + username = StringField('Benutzername') user = None def validate_username(self, field): |