pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Combine data properties and remove unused import

Browse Source
This commit is contained in:
leigh-mil 2019-02-27 13:32:37 -05:00
parent a6296e78df
commit 3b5b809947
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
atst/forms/forms.py
View File

@ -5,6 +5,8 @@ from atst.utils.flash import formatted_flash as flash
class ValidatedForm(FlaskForm): class ValidatedForm(FlaskForm):
EMPTY_LIST_FIELD = ["", None]
def perform_extra_validation(self, *args, **kwargs): def perform_extra_validation(self, *args, **kwargs):
"""Performs any applicable extra validation. Must """Performs any applicable extra validation. Must
return True if the form is valid or False otherwise.""" return True if the form is valid or False otherwise."""
@ -13,6 +15,11 @@ class ValidatedForm(FlaskForm):
@property @property
def data(self): def data(self):
_data = super().data _data = super().data
for field in _data:
if _data[field].__class__.__name__ == "list":
_data[field] = [
el for el in _data[field] if el not in self.EMPTY_LIST_FIELD
]
_data.pop("csrf_token", None) _data.pop("csrf_token", None)
return _data return _data
@ -24,20 +31,8 @@ class ValidatedForm(FlaskForm):
class CacheableForm(ValidatedForm): class CacheableForm(ValidatedForm):
EMPTY_LIST_FIELD = ["", None]
def __init__(self, formdata=None, **kwargs): def __init__(self, formdata=None, **kwargs):
formdata = formdata or {} formdata = formdata or {}
cached_data = current_app.form_cache.from_request(http_request) cached_data = current_app.form_cache.from_request(http_request)
cached_data.update(formdata) cached_data.update(formdata)
super().__init__(cached_data, **kwargs) super().__init__(cached_data, **kwargs)
@property
def data(self):
_data = super(FlaskForm, self).data
for field in _data:
if _data[field].__class__.__name__ == "list":
_data[field] = [
el for el in _data[field] if el not in self.EMPTY_LIST_FIELD
]
return _data

1
atst/forms/ko_review.py
View File

@ -1,5 +1,4 @@
from flask_wtf.file import FileAllowed from flask_wtf.file import FileAllowed
from flask_wtf import FlaskForm
from wtforms.fields.html5 import DateField from wtforms.fields.html5 import DateField
from wtforms.fields import StringField, TextAreaField, FileField, FieldList from wtforms.fields import StringField, TextAreaField, FileField, FieldList