sporada/nopaque
1
0
Fork 0
mirror of https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git synced 2024-11-15 01:05:42 +00:00
Code Issues Projects Releases Wiki Activity

simplify form code

Browse Source
This commit is contained in:
Patrick Jentsch 2022-04-19 11:48:14 +02:00
parent d35ca7c261
commit de4a83582d
3 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/auth/forms.py
View File

@ -23,7 +23,7 @@ class RegistrationForm(FlaskForm):
username = StringField('Username', username = StringField('Username',
validators=[ validators=[
InputRequired(), InputRequired(),
Length(min=1, max=64), Length(1, 64),
Regexp( Regexp(
USERNAME_REGEX, USERNAME_REGEX,
message='Usernames must have only letters, numbers, dots or underscores' # noqa message='Usernames must have only letters, numbers, dots or underscores' # noqa

44
app/corpora/forms.py
View File

@ -15,20 +15,20 @@ class AddCorpusFileForm(FlaskForm):
Form to add a .vrt corpus file to the current corpus. Form to add a .vrt corpus file to the current corpus.
''' '''
# Required fields # Required fields
author = StringField('Author', validators=[InputRequired(), Length(min=1, max=255)]) author = StringField('Author', validators=[InputRequired(), Length(1, 255)])
publishing_year = IntegerField('Publishing year', validators=[InputRequired()]) publishing_year = IntegerField('Publishing year', validators=[InputRequired()])
title = StringField('Title', validators=[InputRequired(), Length(min=1, max=255)]) title = StringField('Title', validators=[InputRequired(), Length(1, 255)])
vrt = FileField('File', validators=[FileRequired()]) vrt = FileField('File', validators=[FileRequired()])
# Optional fields # Optional fields
address = StringField('Adress', validators=[Length(max=255)]) address = StringField('Adress', validators=[Length(255)])
booktitle = StringField('Booktitle', validators=[Length(max=255)]) booktitle = StringField('Booktitle', validators=[Length(255)])
chapter = StringField('Chapter', validators=[Length(max=255)]) chapter = StringField('Chapter', validators=[Length(255)])
editor = StringField('Editor', validators=[Length(max=255)]) editor = StringField('Editor', validators=[Length(255)])
institution = StringField('Institution', validators=[Length(max=255)]) institution = StringField('Institution', validators=[Length(255)])
journal = StringField('Journal', validators=[Length(max=255)]) journal = StringField('Journal', validators=[Length(255)])
pages = StringField('Pages', validators=[Length(max=255)]) pages = StringField('Pages', validators=[Length(255)])
publisher = StringField('Publisher', validators=[Length(max=255)]) publisher = StringField('Publisher', validators=[Length(255)])
school = StringField('School', validators=[Length(max=255)]) school = StringField('School', validators=[Length(255)])
submit = SubmitField() submit = SubmitField()
def validate_vrt(self, field): def validate_vrt(self, field):
@ -40,9 +40,9 @@ class EditCorpusFileForm(FlaskForm):
Form to edit meta data of one corpus file. Form to edit meta data of one corpus file.
''' '''
# Required fields # Required fields
author = StringField('Author', validators=[DataRequired(), Length(1, 255)]) author = StringField('Author', validators=[InputRequired(), Length(1, 255)])
publishing_year = IntegerField('Publishing year', validators=[DataRequired()]) publishing_year = IntegerField('Publishing year', validators=[InputRequired()])
title = StringField('Title', validators=[DataRequired(), Length(1, 255)]) title = StringField('Title', validators=[InputRequired(), Length(1, 255)])
# Optional fields # Optional fields
address = StringField('Adress', validators=[Length(0, 255)]) address = StringField('Adress', validators=[Length(0, 255)])
booktitle = StringField('Booktitle', validators=[Length(0, 255)]) booktitle = StringField('Booktitle', validators=[Length(0, 255)])
@ -60,8 +60,8 @@ class AddCorpusForm(FlaskForm):
''' '''
Form to add a a new corpus. Form to add a a new corpus.
''' '''
description = StringField('Description', validators=[DataRequired(), Length(1, 255)]) description = StringField('Description', validators=[InputRequired(), Length(1, 255)])
title = StringField('Title', validators=[DataRequired(), Length(1, 32)]) title = StringField('Title', validators=[InputRequired(), Length(1, 32)])
submit = SubmitField() submit = SubmitField()
@ -69,14 +69,12 @@ class ImportCorpusForm(FlaskForm):
''' '''
Form to import a corpus. Form to import a corpus.
''' '''
description = StringField('Description', validators=[DataRequired(), Length(1, 255)]) description = StringField('Description', validators=[InputRequired(), Length(1, 255)])
archive = FileField('File', validators=[DataRequired()]) archive = FileField('File', validators=[FileRequired()])
title = StringField('Title', validators=[DataRequired(), Length(1, 32)]) title = StringField('Title', validators=[InputRequired(), Length(1, 32)])
submit = SubmitField() submit = SubmitField()
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
def validate_archive(self, field): def validate_archive(self, field):
if field.data.mimetype != 'application/zip': valid_mimetypes = ['application/zip', 'application/x-zip', 'application/x-zip-compressed']
if field.data.mimetype not in valid_mimetypes:
raise ValidationError('ZIP files only!') raise ValidationError('ZIP files only!')

4
app/services/forms.py
View File

@ -15,8 +15,8 @@ from . import SERVICES
class AddJobForm(FlaskForm): class AddJobForm(FlaskForm):
description = StringField('Description', validators=[InputRequired(), Length(min=1, max=255)]) description = StringField('Description', validators=[InputRequired(), Length(1, 255)])
title = StringField('Title', validators=[InputRequired(), Length(min=1, max=32)]) title = StringField('Title', validators=[InputRequired(), Length(1, 32)])
version = SelectField('Version', validators=[DataRequired()]) version = SelectField('Version', validators=[DataRequired()])
submit = SubmitField() submit = SubmitField()