diff --git a/app/forms/account.py b/app/forms/account.py index 72b22c5..ac887f1 100644 --- a/app/forms/account.py +++ b/app/forms/account.py @@ -1,7 +1,7 @@ from flask_wtf import FlaskForm from wtforms import StringField, PasswordField, BooleanField, TextAreaField, SubmitField, DecimalField, SelectField from wtforms.fields.html5 import DateField, EmailField -from wtforms.validators import DataRequired, Optional, Email, EqualTo +from wtforms.validators import InputRequired, Optional, Email, EqualTo from flask_wtf.file import FileField # Cuz' wtforms' FileField is shitty import app.utils.validators as vd @@ -11,7 +11,7 @@ class RegistrationForm(FlaskForm): 'Pseudonyme', description='Ce nom est définitif !', validators=[ - DataRequired(), + InputRequired(), vd.name_valid, vd.name_available, ], @@ -19,7 +19,7 @@ class RegistrationForm(FlaskForm): email = EmailField( 'Adresse Email', validators=[ - DataRequired(), + InputRequired(), Email(message="Adresse email invalide."), vd.email, ], @@ -27,21 +27,21 @@ class RegistrationForm(FlaskForm): password = PasswordField( 'Mot de passe', validators=[ - DataRequired(), + InputRequired(), vd.password, ], ) password2 = PasswordField( 'Répéter le mot de passe', validators=[ - DataRequired(), + InputRequired(), EqualTo('password', message="Les mots de passe doivent être identiques."), ], ) guidelines = BooleanField( """J'accepte les CGU""", validators=[ - DataRequired(), + InputRequired(), ], ) newsletter = BooleanField( @@ -128,14 +128,14 @@ class DeleteAccountForm(FlaskForm): delete = BooleanField( 'Confirmer la suppression', validators=[ - DataRequired(), + InputRequired(), ], description='Attention, cette opération est irréversible !' ) old_password = PasswordField( 'Mot de passe', validators=[ - DataRequired(), + InputRequired(), vd.old_password, ], ) @@ -268,7 +268,7 @@ class AdminDeleteAccountForm(FlaskForm): delete = BooleanField( 'Confirmer la suppression', validators=[ - DataRequired(), + InputRequired(), ], description='Attention, cette opération est irréversible !', ) diff --git a/app/forms/forum.py b/app/forms/forum.py index 01480ff..328ff07 100644 --- a/app/forms/forum.py +++ b/app/forms/forum.py @@ -1,10 +1,10 @@ from flask_wtf import FlaskForm from wtforms import StringField, SubmitField, TextAreaField, MultipleFileField -from wtforms.validators import DataRequired, Length +from wtforms.validators import InputRequired, Length import app.utils.validators as vd class CommentForm(FlaskForm): - message = TextAreaField('Message', validators=[DataRequired()]) + message = TextAreaField('Message', validators=[InputRequired()]) attachments = MultipleFileField('Pièces-jointes', validators=[vd.file.optional, vd.file.count, vd.file.extension, vd.file.size, vd.file.namelength]) @@ -13,7 +13,7 @@ class CommentForm(FlaskForm): class AnonymousCommentForm(CommentForm): pseudo = StringField('Pseudo', - validators=[DataRequired(), vd.name_valid, vd.name_available]) + validators=[InputRequired(), vd.name_valid, vd.name_available]) class CommentEditForm(CommentForm): submit = SubmitField('Modifier') @@ -24,7 +24,7 @@ class AnonymousCommentEditForm(CommentEditForm, AnonymousCommentForm): class TopicCreationForm(CommentForm): title = StringField('Nom du sujet', - validators=[DataRequired(), Length(min=3, max=32)]) + validators=[InputRequired(), Length(min=3, max=32)]) submit = SubmitField('Créer le sujet') class AnonymousTopicCreationForm(TopicCreationForm, AnonymousCommentForm): diff --git a/app/forms/login.py b/app/forms/login.py index 72bec53..498a319 100644 --- a/app/forms/login.py +++ b/app/forms/login.py @@ -1,19 +1,19 @@ from flask_wtf import FlaskForm from wtforms import StringField, PasswordField, BooleanField, SubmitField -from wtforms.validators import DataRequired +from wtforms.validators import InputRequired class LoginForm(FlaskForm): username = StringField( 'Identifiant', validators=[ - DataRequired(), + InputRequired(), ], ) password = PasswordField( 'Mot de passe', validators=[ - DataRequired(), + InputRequired(), ], ) remember_me = BooleanField( diff --git a/app/forms/search.py b/app/forms/search.py index 6ebac62..5ab431f 100644 --- a/app/forms/search.py +++ b/app/forms/search.py @@ -1,7 +1,7 @@ from flask_wtf import FlaskForm from wtforms import StringField, SubmitField from wtforms.fields.html5 import DateField -from wtforms.validators import DataRequired, Optional +from wtforms.validators import InputRequired, Optional # TODO: compléter le formulaire de recherche avancée @@ -9,7 +9,7 @@ class AdvancedSearchForm(FlaskForm): q = StringField( 'Rechercher :', validators=[ - DataRequired(), + InputRequired(), ], ) date = DateField( @@ -27,6 +27,6 @@ class SearchForm(FlaskForm): q = StringField( 'Rechercher', validators=[ - DataRequired(), + InputRequired(), ], ) diff --git a/app/forms/trophies.py b/app/forms/trophies.py index 62825c9..4a77b02 100644 --- a/app/forms/trophies.py +++ b/app/forms/trophies.py @@ -1,6 +1,6 @@ from flask_wtf import FlaskForm from wtforms import StringField, SubmitField, BooleanField -from wtforms.validators import DataRequired, Optional +from wtforms.validators import InputRequired, Optional from flask_wtf.file import FileField # Cuz' wtforms' FileField is shitty @@ -8,7 +8,7 @@ class TrophyForm(FlaskForm): name = StringField( 'Nom', validators=[ - DataRequired(), + InputRequired(), ], ) icon = FileField( @@ -43,7 +43,7 @@ class DeleteTrophyForm(FlaskForm): delete = BooleanField( 'Confirmer la suppression', validators=[ - DataRequired(), + InputRequired(), ], description='Attention, cette opération est irréversible !', )