upgrade wtform

master
TuxCoder 2022-06-17 09:25:14 +02:00
parent 8287b01e40
commit 4105974fe0
4 changed files with 13 additions and 13 deletions

View File

@ -1,11 +1,11 @@
from flask_babel import gettext from flask_babel import gettext
from flask_wtf import FlaskForm from flask_wtf import FlaskForm
from wtforms import StringField, SubmitField, TextField, \ from wtforms import StringField, SubmitField, \
TextAreaField, PasswordField, IntegerField, FloatField, \ TextAreaField, PasswordField, IntegerField, FloatField, \
DateTimeField, DateField, FormField, BooleanField, \ DateTimeField, DateField, FormField, BooleanField, \
SelectField, Form as NoCsrfForm, SelectMultipleField SelectField, Form as NoCsrfForm, SelectMultipleField
from wtforms.fields.html5 import URLField from wtforms.fields import URLField
from wtforms.fields import FormField, SelectMultipleField from wtforms.fields import FormField, SelectMultipleField
from .base import FieldList from .base import FieldList

View File

@ -1,12 +1,12 @@
from flask_babel import gettext from flask_babel import gettext
from flask_wtf import FlaskForm from flask_wtf import FlaskForm
from wtforms import StringField, SubmitField, TextField, \ from wtforms import StringField, SubmitField, \
TextAreaField, PasswordField, IntegerField, FloatField, \ TextAreaField, PasswordField, IntegerField, FloatField, \
DateTimeField, DateField, FormField, BooleanField, \ DateTimeField, DateField, FormField, BooleanField, \
SelectField, Form as NoCsrfForm, SelectMultipleField, \ SelectField, Form as NoCsrfForm, SelectMultipleField, \
HiddenField HiddenField
from wtforms.fields.html5 import EmailField from wtforms.fields import EmailField
from wtforms.widgets.html5 import NumberInput, DateInput from wtforms.widgets import NumberInput, DateInput
from wtforms.validators import DataRequired, NumberRange, Optional, NoneOf, Length, Regexp, InputRequired from wtforms.validators import DataRequired, NumberRange, Optional, NoneOf, Length, Regexp, InputRequired
from datetime import datetime from datetime import datetime
@ -22,7 +22,7 @@ class PasswordForm(FlaskForm):
class TotpForm(FlaskForm): class TotpForm(FlaskForm):
totp = TextField(gettext('2FA Token')) totp = StringField(gettext('2FA Token'))
submit = SubmitField(gettext('Authorize')) submit = SubmitField(gettext('Authorize'))
@ -32,7 +32,7 @@ class WebauthnLoginForm(FlaskForm):
assertion = HiddenField('Assertion', [InputRequired()]) assertion = HiddenField('Assertion', [InputRequired()])
class Fido2Form(FlaskForm): class Fido2Form(FlaskForm):
fido2 = TextField(gettext('Fido2'), default="Javascript Required") fido2 = StringField(gettext('Fido2'), default="Javascript Required")
submit = SubmitField(gettext('Authorize')) submit = SubmitField(gettext('Authorize'))

View File

@ -1,10 +1,10 @@
from flask_babel import gettext from flask_babel import gettext
from flask_wtf import FlaskForm from flask_wtf import FlaskForm
from wtforms import StringField, SubmitField, TextField, \ from wtforms import StringField, SubmitField, \
TextAreaField, PasswordField, IntegerField, FloatField, \ TextAreaField, PasswordField, IntegerField, FloatField, \
DateTimeField, DateField, FormField, BooleanField, \ DateTimeField, DateField, FormField, BooleanField, \
SelectField, Form as NoCsrfForm, HiddenField SelectField, Form as NoCsrfForm, HiddenField
from wtforms.widgets.html5 import NumberInput, DateInput from wtforms.widgets import NumberInput, DateInput
from wtforms.validators import DataRequired, NumberRange, \ from wtforms.validators import DataRequired, NumberRange, \
Optional, NoneOf, Length, EqualTo, InputRequired Optional, NoneOf, Length, EqualTo, InputRequired
@ -25,8 +25,8 @@ class ClientCertForm(FlaskForm):
class TOTPForm(FlaskForm): class TOTPForm(FlaskForm):
secret = HiddenField(gettext('totp-Secret')) secret = HiddenField(gettext('totp-Secret'))
token = TextField(gettext('totp-verify token')) token = StringField(gettext('totp-verify token'))
name = TextField(gettext('name')) name = StringField(gettext('name'))
submit = SubmitField(gettext('Activate')) submit = SubmitField(gettext('Activate'))

View File

@ -44,8 +44,8 @@ window.fieldlist = {
var template = templateTag.content.cloneNode(true); var template = templateTag.content.cloneNode(true);
var id = templateTag.dataset['fieldlistNextId']++; var id = templateTag.dataset['fieldlistNextId']++;
for(let tag of template.querySelectorAll('[name], [id]')){ for(let tag of template.querySelectorAll('[name], [id]')){
tag.name = tag.name.replace(/^custom-/, name+'-'+id+'-') tag.name = tag.name.replace(/^custom/, `${name}-${id}`)
tag.id = tag.id.replace(/^custom-/, name+'-'+id+'-') tag.id = tag.id.replace(/^custom/, `${name}-${id}`)
}; };
templateTag.parentNode.querySelector('ul').appendChild(template); templateTag.parentNode.querySelector('ul').appendChild(template);