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

Respond to PR feedback

Browse source
This commit is contained in:
Seamus Johnston 2022-12-06 15:51:41 -06:00
parent 07993a8d75
commit 90557c51e8
No known key found for this signature in database
GPG key ID: 2F21225985069105
4 changed files with 47 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -52,7 +52,6 @@ class OrganizationTypeForm(RegistrarForm):
class OrganizationFederalForm(RegistrarForm):
federal_type = forms.ChoiceField(
required=False,
choices=DomainApplication.BranchChoices.choices,
widget=forms.RadioSelect,
)
@ -60,7 +59,6 @@ class OrganizationFederalForm(RegistrarForm):
class OrganizationElectionForm(RegistrarForm):
is_election_board = forms.BooleanField(
required=False,
widget=forms.RadioSelect(
choices=[
(True, "Yes"),
@ -120,9 +118,10 @@ class CurrentSitesForm(RegistrarForm):
if not self.is_valid():
return
obj.save()
normalized = Domain.normalize(self.cleaned_data["current_site"])
# TODO: ability to update existing records
obj.current_websites.create(website=normalized)
normalized = Domain.normalize(self.cleaned_data["current_site"], blank=True)
if normalized:
# TODO: ability to update existing records
obj.current_websites.create(website=normalized)
def from_database(self, obj):
"""Initializes this form's fields with values gotten from `obj`."""
@ -142,20 +141,26 @@ class DotGovDomainForm(RegistrarForm):
"""Adds this form's cleaned data to `obj` and saves `obj`."""
if not self.is_valid():
return
normalized = Domain.normalize(self.cleaned_data["requested_domain"], "gov")
requested_domain = getattr(obj, "requested_domain", None)
if requested_domain is not None:
requested_domain.name = normalized
requested_domain.save()
else:
requested_domain = Domain.objects.create(name=normalized)
obj.requested_domain = requested_domain
obj.save()
normalized = Domain.normalize(
self.cleaned_data["requested_domain"], "gov", blank=True
)
if normalized:
requested_domain = getattr(obj, "requested_domain", None)
if requested_domain is not None:
requested_domain.name = normalized
requested_domain.save()
else:
requested_domain = Domain.objects.create(name=normalized)
obj.requested_domain = requested_domain
obj.save()
obj.save()
normalized = Domain.normalize(self.cleaned_data["alternative_domain"], "gov")
# TODO: ability to update existing records
obj.alternative_domains.create(website=normalized)
normalized = Domain.normalize(
self.cleaned_data["alternative_domain"], "gov", blank=True
)
if normalized:
# TODO: ability to update existing records
obj.alternative_domains.create(website=normalized)
def from_database(self, obj):
"""Initializes this form's fields with values gotten from `obj`."""
@ -252,7 +257,9 @@ class SecurityEmailForm(RegistrarForm):
class AnythingElseForm(RegistrarForm):
anything_else = forms.CharField(
required=False, label="Anything else we should know", widget=forms.Textarea()
required=False,
label="Anything else we should know",
widget=forms.Textarea(),
)