diff options
-rw-r--r-- | accounts/forms.py | 16 | ||||
-rw-r--r-- | accounts/views/login/forms.py | 6 | ||||
-rw-r--r-- | requirements.txt | 18 |
3 files changed, 20 insertions, 20 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): diff --git a/accounts/views/login/forms.py b/accounts/views/login/forms.py index f36d48c..e4155b4 100644 --- a/accounts/views/login/forms.py +++ b/accounts/views/login/forms.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- from flask_wtf import FlaskForm as Form -from wtforms import TextField, PasswordField, validators +from wtforms import StringField, PasswordField, validators class LoginForm(Form): - username = TextField('Benutzername') - password = PasswordField('Passwort', [validators.Required()]) + username = StringField('Benutzername') + password = PasswordField('Passwort', [validators.DataRequired()]) diff --git a/requirements.txt b/requirements.txt index 9fab275..33e7e2c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,11 +1,11 @@ -Flask==1.1.2 # >=0.10 -Flask-WTF==0.14.3 # none -Flask-Script==0.6.7 # none -Flask-Login==0.5.0 # none -Werkzeug==1.0.1 # >=0.6 -Jinja2==2.11.2 # >=2.4 -WTForms==2.3.3 # >=1.0 -itsdangerous==1.1.0 # none -email_validator==1.1.1 +Flask==2.2.2 # >=0.10 +Flask-WTF==1.1.1 # none +Flask-Script==2.0.6 # none +Flask-Login==0.6.2 # none +Werkzeug==2.2.2 # >=0.6 +Jinja2==3.1.2 # >=2.4 +WTForms==3.0.1 # >=1.0 +itsdangerous==2.1.2 # none +email_validator==1.3.1 pycryptodome ldap3 |