Commit 14862cba authored by Sergey Markelov's avatar Sergey Markelov

*) Fixed WTForms 2.0 warning - Required is going away in WTForms 3.0, use DataRequired

parent 44f78e43
...@@ -46,8 +46,8 @@ class User(db.Document): ...@@ -46,8 +46,8 @@ class User(db.Document):
# Define login and registration forms (for flask-login) # Define login and registration forms (for flask-login)
class LoginForm(form.Form): class LoginForm(form.Form):
login = fields.TextField(validators=[validators.required()]) login = fields.TextField(validators=[validators.DataRequired()])
password = fields.PasswordField(validators=[validators.required()]) password = fields.PasswordField(validators=[validators.DataRequired()])
def validate_login(self, field): def validate_login(self, field):
user = self.get_user() user = self.get_user()
...@@ -63,9 +63,9 @@ class LoginForm(form.Form): ...@@ -63,9 +63,9 @@ class LoginForm(form.Form):
class RegistrationForm(form.Form): class RegistrationForm(form.Form):
login = fields.TextField(validators=[validators.required()]) login = fields.TextField(validators=[validators.DataRequired()])
email = fields.TextField() email = fields.TextField()
password = fields.PasswordField(validators=[validators.required()]) password = fields.PasswordField(validators=[validators.DataRequired()])
def validate_login(self, field): def validate_login(self, field):
if User.objects(login=self.login.data): if User.objects(login=self.login.data):
......
...@@ -50,8 +50,8 @@ class User(db.Model): ...@@ -50,8 +50,8 @@ class User(db.Model):
# Define login and registration forms (for flask-login) # Define login and registration forms (for flask-login)
class LoginForm(form.Form): class LoginForm(form.Form):
login = fields.TextField(validators=[validators.required()]) login = fields.TextField(validators=[validators.DataRequired()])
password = fields.PasswordField(validators=[validators.required()]) password = fields.PasswordField(validators=[validators.DataRequired()])
def validate_login(self, field): def validate_login(self, field):
user = self.get_user() user = self.get_user()
...@@ -67,9 +67,9 @@ class LoginForm(form.Form): ...@@ -67,9 +67,9 @@ class LoginForm(form.Form):
class RegistrationForm(form.Form): class RegistrationForm(form.Form):
login = fields.TextField(validators=[validators.required()]) login = fields.TextField(validators=[validators.DataRequired()])
email = fields.TextField() email = fields.TextField()
password = fields.PasswordField(validators=[validators.required()]) password = fields.PasswordField(validators=[validators.DataRequired()])
def validate_login(self, field): def validate_login(self, field):
if db.session.query(User).filter_by(login=self.login.data).count() > 0: if db.session.query(User).filter_by(login=self.login.data).count() > 0:
......
...@@ -122,7 +122,7 @@ class PostAdmin(sqla.ModelView): ...@@ -122,7 +122,7 @@ class PostAdmin(sqla.ModelView):
# Pass arguments to WTForms. In this case, change label for text field to # Pass arguments to WTForms. In this case, change label for text field to
# be 'Big Text' and add required() validator. # be 'Big Text' and add required() validator.
form_args = dict( form_args = dict(
text=dict(label='Big Text', validators=[validators.required()]) text=dict(label='Big Text', validators=[validators.DataRequired()])
) )
form_ajax_refs = { form_ajax_refs = {
......
...@@ -57,7 +57,7 @@ class UploadForm(form.BaseForm): ...@@ -57,7 +57,7 @@ class UploadForm(form.BaseForm):
class EditForm(form.BaseForm): class EditForm(form.BaseForm):
content = fields.TextAreaField(lazy_gettext('Content'), content = fields.TextAreaField(lazy_gettext('Content'),
(validators.required(),)) (validators.DataRequired(),))
class FileAdmin(BaseView, ActionsMixin): class FileAdmin(BaseView, ActionsMixin):
......
...@@ -71,7 +71,7 @@ class CustomModelConverter(orm.ModelConverter): ...@@ -71,7 +71,7 @@ class CustomModelConverter(orm.ModelConverter):
kwargs.update(field_args) kwargs.update(field_args)
if field.required: if field.required:
kwargs['validators'].append(validators.Required()) kwargs['validators'].append(validators.DataRequired())
else: else:
kwargs['validators'].append(validators.Optional()) kwargs['validators'].append(validators.Optional())
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment