zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-06-09 22:14:43 +02:00
Code Issues Projects Releases Packages Wiki Activity

Respond to PR feedback

Browse source
This commit is contained in:
Seamus Johnston 2023-02-03 14:24:18 -06:00
parent 456cab6cee
commit b3784776d7
No known key found for this signature in database
GPG key ID: 2F21225985069105
22 changed files with 54 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/registrar/forms/application_wizard.py
View file

@ -416,6 +416,7 @@ CurrentSitesFormSet = forms.formset_factory(
formset=BaseCurrentSitesFormSet,
)
class AlternativeDomainForm(RegistrarForm):
def clean_alternative_domain(self):
"""Validation code for domain names."""
@ -423,19 +424,23 @@ class AlternativeDomainForm(RegistrarForm):
requested = self.cleaned_data.get("alternative_domain", None)
validated = Domain.validate(requested, blank_ok=True)
except errors.ExtraDotsError:
raise forms.ValidationError(code="extra_dots")
raise forms.ValidationError(
DOMAIN_API_MESSAGES["extra_dots"], code="extra_dots"
)
except errors.DomainUnavailableError:
raise forms.ValidationError(code="unavailable")
raise forms.ValidationError(
DOMAIN_API_MESSAGES["unavailable"], code="unavailable"
)
except ValueError:
raise forms.ValidationError(code="invalid")
raise forms.ValidationError(DOMAIN_API_MESSAGES["invalid"], code="invalid")
return validated
alternative_domain = forms.CharField(
required=False,
label="Alternative domain",
error_messages=DOMAIN_API_MESSAGES
)
class BaseAlternativeDomainFormSet(RegistrarFormSet):
JOIN = "alternative_domains"
@ -508,19 +513,22 @@ class DotGovDomainForm(RegistrarForm):
requested = self.cleaned_data.get("requested_domain", None)
validated = Domain.validate(requested)
except errors.BlankValueError:
raise forms.ValidationError(code="required")
raise forms.ValidationError(
DOMAIN_API_MESSAGES["required"], code="required"
)
except errors.ExtraDotsError:
raise forms.ValidationError(code="extra_dots")
raise forms.ValidationError(
DOMAIN_API_MESSAGES["extra_dots"], code="extra_dots"
)
except errors.DomainUnavailableError:
raise forms.ValidationError(code="unavailable")
raise forms.ValidationError(
DOMAIN_API_MESSAGES["unavailable"], code="unavailable"
)
except ValueError:
raise forms.ValidationError(code="invalid")
raise forms.ValidationError(DOMAIN_API_MESSAGES["invalid"], code="invalid")
return validated
requested_domain = forms.CharField(
label="What .gov domain do you want?",
error_messages=DOMAIN_API_MESSAGES
)
requested_domain = forms.CharField(label="What .gov domain do you want?")
class PurposeForm(RegistrarForm):