darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-19 05:59:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4098 from alphagov/form-bug-fixes

Browse Source 
Fix two small bugs with forms
This commit is contained in:
Katie Smith
2021-12-13 11:19:11 +00:00
committed by GitHub
parent e5df9614f7 d8ebcdce22
commit 2fe6c34730
3 changed files with 55 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/main/forms.py
View File

@@ -231,7 +231,7 @@ def govuk_text_input_field_widget(self, field, type=None, param_extensions=None,
"data-error-type": field.errors[0],
"data-error-label": field.name
},
error_message_format: " ".join(field.errors).strip()
error_message_format: field.errors[0]
}
# convert to parameters that govuk understands
@@ -657,7 +657,7 @@ def govuk_checkbox_field_widget(self, field, param_extensions=None, **kwargs):
"data-error-type": field.errors[0],
"data-error-label": field.name
},
"text": " ".join(field.errors).strip()
"text": field.errors[0]
}
params = {
@@ -710,7 +710,7 @@ def govuk_checkboxes_field_widget(self, field, wrap_in_collapsible=False, param_
"data-error-type": field.errors[0],
"data-error-label": field.name
},
"text": " ".join(field.errors).strip()
"text": field.errors[0]
}
# returns either a list or a hierarchy of lists
@@ -765,7 +765,7 @@ def govuk_radios_field_widget(self, field, param_extensions=None, **kwargs):
"data-error-type": field.errors[0],
"data-error-label": field.name
},
"text": " ".join(field.errors).strip()
"text": field.errors[0]
}
# returns either a list or a hierarchy of lists
@@ -1535,6 +1535,12 @@ class ChangeEmailForm(StripWhitespaceForm):
email_address = email_address()
def validate_email_address(self, field):
# The validate_email_func can be used to call API to check if the email address is already in
# use. We don't want to run that check for invalid email addresses, since that will cause an error.
# If there are any other validation errors on the email_address, we should skip this check.
if self.email_address.errors:
return
is_valid = self.validate_email_func(field.data)
if is_valid:
raise ValidationError("The email address is already in use")