Don't use html validation for funding type field
This commit is contained in:
parent
0356d61960
commit
e065bd27c1
@ -1,5 +1,5 @@
|
|||||||
from wtforms.fields.html5 import DateField
|
from wtforms.fields.html5 import DateField
|
||||||
from wtforms.fields import Field
|
from wtforms.fields import Field, SelectField as SelectField_
|
||||||
from wtforms.widgets import TextArea
|
from wtforms.widgets import TextArea
|
||||||
|
|
||||||
from atst.domain.date import parse_date
|
from atst.domain.date import parse_date
|
||||||
@ -41,3 +41,13 @@ class NewlineListField(Field):
|
|||||||
self.data = "\n".join(value)
|
self.data = "\n".join(value)
|
||||||
else:
|
else:
|
||||||
self.data = value
|
self.data = value
|
||||||
|
|
||||||
|
|
||||||
|
class SelectField(SelectField_):
|
||||||
|
def __init__(self, *args, **kwargs):
|
||||||
|
render_kw = kwargs.get("render_kw", {})
|
||||||
|
kwargs["render_kw"] = {
|
||||||
|
**render_kw,
|
||||||
|
"required": False
|
||||||
|
}
|
||||||
|
super().__init__(*args, **kwargs)
|
||||||
|
@ -1,12 +1,12 @@
|
|||||||
import re
|
import re
|
||||||
from wtforms.fields.html5 import EmailField
|
from wtforms.fields.html5 import EmailField
|
||||||
from wtforms.fields import StringField, SelectField
|
from wtforms.fields import StringField
|
||||||
from wtforms.validators import Required, Email, InputRequired, Regexp
|
from wtforms.validators import Required, Email, InputRequired, Regexp, DataRequired
|
||||||
|
|
||||||
from atst.domain.exceptions import NotFoundError
|
from atst.domain.exceptions import NotFoundError
|
||||||
from atst.domain.pe_numbers import PENumbers
|
from atst.domain.pe_numbers import PENumbers
|
||||||
|
|
||||||
from .fields import NewlineListField
|
from .fields import NewlineListField, SelectField
|
||||||
from .forms import ValidatedForm
|
from .forms import ValidatedForm
|
||||||
|
|
||||||
|
|
||||||
@ -116,7 +116,8 @@ class FinancialForm(ValidatedForm):
|
|||||||
("PROC", "Procurement (PROC)"),
|
("PROC", "Procurement (PROC)"),
|
||||||
("OTHER", "Other"),
|
("OTHER", "Other"),
|
||||||
],
|
],
|
||||||
validators=[InputRequired()]
|
validators=[Required()],
|
||||||
|
render_kw={"required": False}
|
||||||
)
|
)
|
||||||
|
|
||||||
funding_type_other = StringField("If other, please specify")
|
funding_type_other = StringField("If other, please specify")
|
||||||
|
Loading…
x
Reference in New Issue
Block a user