Fix deprecation warning, rename Form to FlaskForm
Starting with flask_wtform version 1.0, Form will be dropped in favor of FlaskForm.
This commit is contained in:
parent
1bfb6cd2f6
commit
530302b74f
@ -4,7 +4,7 @@ from datetime import datetime
|
||||
from datetime import date
|
||||
import pillarsdk
|
||||
from flask import current_app
|
||||
from flask_wtf import Form
|
||||
from flask_wtf import FlaskForm
|
||||
from wtforms import StringField
|
||||
from wtforms import DateField
|
||||
from wtforms import SelectField
|
||||
@ -110,7 +110,7 @@ def get_node_form(node_type):
|
||||
:param node_type: Describes the node type via dyn_schema, form_schema and
|
||||
parent
|
||||
"""
|
||||
class ProceduralForm(Form):
|
||||
class ProceduralForm(FlaskForm):
|
||||
pass
|
||||
|
||||
parent_prop = node_type['parent']
|
||||
|
@ -1,4 +1,4 @@
|
||||
from flask_wtf import Form
|
||||
from flask_wtf import FlaskForm
|
||||
from wtforms import StringField
|
||||
from wtforms import BooleanField
|
||||
from wtforms import HiddenField
|
||||
@ -12,7 +12,7 @@ from pillar.web import system_util
|
||||
from pillar.web.utils.forms import FileSelectField, JSONRequired
|
||||
|
||||
|
||||
class ProjectForm(Form):
|
||||
class ProjectForm(FlaskForm):
|
||||
project_id = HiddenField('project_id', validators=[DataRequired()])
|
||||
name = StringField('Name', validators=[DataRequired()])
|
||||
url = StringField('Url', validators=[DataRequired()])
|
||||
@ -32,7 +32,7 @@ class ProjectForm(Form):
|
||||
picture_square = FileSelectField('Picture square', file_format='image')
|
||||
|
||||
def validate(self):
|
||||
rv = Form.validate(self)
|
||||
rv = FlaskForm.validate(self)
|
||||
if not rv:
|
||||
return False
|
||||
|
||||
@ -54,7 +54,7 @@ class ProjectForm(Form):
|
||||
return True
|
||||
|
||||
|
||||
class NodeTypeForm(Form):
|
||||
class NodeTypeForm(FlaskForm):
|
||||
project_id = HiddenField('project_id', validators=[DataRequired()])
|
||||
name = StringField('Name', validators=[DataRequired()])
|
||||
parent = StringField('Parent')
|
||||
|
@ -1,5 +1,5 @@
|
||||
from flask_login import current_user
|
||||
from flask_wtf import Form
|
||||
from flask_wtf import FlaskForm
|
||||
from pillar.web import system_util
|
||||
from pillarsdk.users import User
|
||||
|
||||
@ -14,7 +14,7 @@ from wtforms.validators import Regexp
|
||||
import wtforms.validators as wtvalid
|
||||
|
||||
|
||||
class UserLoginForm(Form):
|
||||
class UserLoginForm(FlaskForm):
|
||||
username = StringField('Username', validators=[DataRequired()])
|
||||
password = PasswordField('Password', validators=[DataRequired()])
|
||||
remember_me = BooleanField('Remember Me')
|
||||
@ -23,7 +23,7 @@ class UserLoginForm(Form):
|
||||
super(UserLoginForm, self).__init__(csrf_enabled=False, *args, **kwargs)
|
||||
|
||||
|
||||
class UserProfileForm(Form):
|
||||
class UserProfileForm(FlaskForm):
|
||||
username = StringField('Username', validators=[DataRequired(), Length(
|
||||
min=3, max=128, message="Min. 3, max. 128 chars please"), Regexp(
|
||||
r'^[\w.@+-]+$', message="Please do not use spaces")])
|
||||
@ -52,7 +52,7 @@ class UserProfileForm(Form):
|
||||
return True
|
||||
|
||||
|
||||
class UserSettingsEmailsForm(Form):
|
||||
class UserSettingsEmailsForm(FlaskForm):
|
||||
choices = [
|
||||
(1, 'Keep me updated with Blender Cloud news.'),
|
||||
(0, 'Do not mail me news update.')]
|
||||
@ -74,7 +74,7 @@ class RolesField(SelectMultipleField):
|
||||
return current_app.user_roles
|
||||
|
||||
|
||||
class UserEditForm(Form):
|
||||
class UserEditForm(FlaskForm):
|
||||
roles = RolesField('Roles')
|
||||
email = StringField(
|
||||
validators=[wtvalid.DataRequired(), wtvalid.Email()],
|
||||
|
Loading…
x
Reference in New Issue
Block a user