Use email fields for feedback form

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

View File

@@ -38,6 +38,10 @@ class CsvFileValidator:
class ValidGovEmail:
def __call__(self, form, field):
if field.data == '':
return
from flask import url_for
message = (
'Enter a government email address.'
@@ -53,10 +57,15 @@ class ValidEmail(Email):
super().__init__('Enter a valid email address')
def __call__(self, form, field):
if field.data == '':
return
try:
validate_email_address(field.data)
except InvalidEmailError:
raise ValidationError(self.message)
return super().__call__(form, field)