From d0b68acbe9b77e7d9b4d0ba0c2c7bf4eb46af7ce Mon Sep 17 00:00:00 2001 From: richard-dds Date: Mon, 9 Jul 2018 10:38:22 -0400 Subject: [PATCH 1/2] Email address does not need to come from CAC --- atst/forms/poc.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atst/forms/poc.py b/atst/forms/poc.py index 4f2fe1cb..f0ac093f 100644 --- a/atst/forms/poc.py +++ b/atst/forms/poc.py @@ -9,7 +9,7 @@ class POCForm(Form): lname_poc = StringField("POC Last Name", validators=[Required()]) email_poc = StringField( - "POC Email (associated with CAC)", validators=[Required(), Email()] + "POC Email Address", validators=[Required(), Email()] ) dodid_poc = StringField( From 73eb21a8632a83efb3cc21e83167e60ce51e3e18 Mon Sep 17 00:00:00 2001 From: richard-dds Date: Mon, 9 Jul 2018 13:13:30 -0400 Subject: [PATCH 2/2] Only allow letters in POC name fields --- atst/forms/poc.py | 10 ++++------ atst/forms/validators.py | 9 +++++++++ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/atst/forms/poc.py b/atst/forms/poc.py index f0ac093f..5d64182d 100644 --- a/atst/forms/poc.py +++ b/atst/forms/poc.py @@ -1,16 +1,14 @@ from wtforms.fields import StringField from wtforms.validators import Required, Email, Length from wtforms_tornado import Form -from .validators import IsNumber +from .validators import IsNumber, Alphabet class POCForm(Form): - fname_poc = StringField("POC First Name", validators=[Required()]) - lname_poc = StringField("POC Last Name", validators=[Required()]) + fname_poc = StringField("POC First Name", validators=[Required(), Alphabet()]) + lname_poc = StringField("POC Last Name", validators=[Required(), Alphabet()]) - email_poc = StringField( - "POC Email Address", validators=[Required(), Email()] - ) + email_poc = StringField("POC Email Address", validators=[Required(), Email()]) dodid_poc = StringField( "DOD ID", validators=[Required(), Length(min=10), IsNumber()] diff --git a/atst/forms/validators.py b/atst/forms/validators.py index bb9a08c3..3937dabb 100644 --- a/atst/forms/validators.py +++ b/atst/forms/validators.py @@ -41,3 +41,12 @@ def PhoneNumber(message="Please enter a valid 5 or 10 digit phone number."): raise ValidationError(message) return _is_phone_number + + +def Alphabet(message="Please enter only letters."): + def _alphabet(form, field): + match = re.match(r"[A-Za-z]+", field.data) + if not match or match.group() != field.data: + raise ValidationError(message) + + return _alphabet