darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-07-21 08:29:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use email fields for feedback form

Browse Source 
Otherwise we can end up collecting invalid email addresses…

This required some refactoring to allow our email fields to be optional
(but not by default).
This commit is contained in:
Chris Hill-Scott
2018-12-07 12:23:12 +00:00
parent 7c4b292770
commit 184a9fa605
3 changed files with 42 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/main/forms.py
View File

@@ -110,15 +110,18 @@ class MultiCheckboxField(SelectMultipleField):
option_widget = CheckboxInput()
def email_address(label='Email address', gov_user=True):
def email_address(label='Email address', gov_user=True, required=True):
validators = [
Length(min=5, max=255),
DataRequired(message='Can’t be empty'),
ValidEmail()
ValidEmail(),
]
if gov_user:
validators.append(ValidGovEmail())
if required:
validators.append(DataRequired(message='Can’t be empty'))
return EmailField(label, validators)
@@ -561,7 +564,7 @@ class SupportType(StripWhitespaceForm):
class Feedback(StripWhitespaceForm):
name = StringField('Name')
email_address = StringField('Email address')
email_address = email_address(label='Email address', gov_user=False, required=False)
feedback = TextAreaField('Your message', validators=[DataRequired(message="Can’t be empty")])