diff --git a/atst/forms/ccpo_review.py b/atst/forms/ccpo_review.py index 1742ca6d..8b6ea64d 100644 --- a/atst/forms/ccpo_review.py +++ b/atst/forms/ccpo_review.py @@ -1,6 +1,6 @@ from wtforms.fields.html5 import EmailField, TelField from wtforms.fields import StringField, TextAreaField -from wtforms.validators import Email +from wtforms.validators import Email, Optional from .forms import ValidatedForm from .validators import Alphabet, PhoneNumber @@ -8,11 +8,19 @@ from .validators import Alphabet, PhoneNumber class CCPOReviewForm(ValidatedForm): comment = TextAreaField("Comments (optional)") - fname_mao = StringField("First Name (optional)", validators=[Alphabet()]) - lname_mao = StringField("Last Name (optional)", validators=[Alphabet()]) - email_mao = EmailField("Mission Owner e-mail (optional)", validators=[Email()]) - phone_mao = TelField( - "Mission Owner phone number (optional)", validators=[PhoneNumber()] + fname_mao = StringField( + "First Name (optional)", validators=[Optional(), Alphabet()] + ) + lname_mao = StringField("Last Name (optional)", validators=[Optional(), Alphabet()]) + email_mao = EmailField( + "Mission Owner e-mail (optional)", validators=[Optional(), Email()] + ) + phone_mao = TelField( + "Mission Owner phone number (optional)", validators=[Optional(), PhoneNumber()] + ) + fname_ccpo = StringField( + "First Name (optional)", validators=[Optional(), Alphabet()] + ) + lname_ccpo = StringField( + "Last Name (optional)", validators=[Optional(), Alphabet()] ) - fname_ccpo = StringField("First Name (optional)", validators=[Alphabet()]) - lname_ccpo = StringField("Last Name (optional)", validators=[Alphabet()]) diff --git a/templates/requests/approval.html b/templates/requests/approval.html index deaf8504..8cf4ec2c 100644 --- a/templates/requests/approval.html +++ b/templates/requests/approval.html @@ -8,6 +8,13 @@
+{% if f.errors %} + {{ Alert('There were some errors', + message="

Please see below.

", + level='error' + ) }} +{% endif %} +
{{ f.csrf_token }}