mirror of
https://github.com/cisagov/manage.get.gov.git
synced 2025-06-09 14:04:44 +02:00
updated linter length; linter reformatted several files
This commit is contained in:
David Kennedy
parent
f0636013e0
commit
c760417e6a
65 changed files with 550 additions and 1727 deletions
|
|
@ -50,9 +50,7 @@ class RegistrarForm(forms.Form):
|
|||
"""Returns a dict of form field values gotten from `obj`."""
|
||||
if obj is None:
|
||||
return {}
|
||||
return {
|
||||
name: getattr(obj, name) for name in cls.declared_fields.keys()
|
||||
} # type: ignore
|
||||
return {name: getattr(obj, name) for name in cls.declared_fields.keys()} # type: ignore
|
||||
|
||||
|
||||
class RegistrarFormSet(forms.BaseFormSet):
|
||||
|
|
@ -178,10 +176,7 @@ class TribalGovernmentForm(RegistrarForm):
|
|||
|
||||
def clean(self):
|
||||
"""Needs to be either state or federally recognized."""
|
||||
if not (
|
||||
self.cleaned_data["federally_recognized_tribe"]
|
||||
or self.cleaned_data["state_recognized_tribe"]
|
||||
):
|
||||
if not (self.cleaned_data["federally_recognized_tribe"] or self.cleaned_data["state_recognized_tribe"]):
|
||||
raise forms.ValidationError(
|
||||
# no sec because we are using it to include an internal URL
|
||||
# into a link. There should be no user-facing input in the
|
||||
|
|
@ -203,11 +198,7 @@ class OrganizationFederalForm(RegistrarForm):
|
|||
federal_type = forms.ChoiceField(
|
||||
choices=DomainApplication.BranchChoices.choices,
|
||||
widget=forms.RadioSelect,
|
||||
error_messages={
|
||||
"required": (
|
||||
"Select the part of the federal government your organization is in."
|
||||
)
|
||||
},
|
||||
error_messages={"required": ("Select the part of the federal government your organization is in.")},
|
||||
)
|
||||
|
||||
|
||||
|
|
@ -227,10 +218,7 @@ class OrganizationElectionForm(RegistrarForm):
|
|||
is_election_board = self.cleaned_data["is_election_board"]
|
||||
if is_election_board is None:
|
||||
raise forms.ValidationError(
|
||||
(
|
||||
"Select “Yes” if you represent an election office. Select “No” if"
|
||||
" you don’t."
|
||||
),
|
||||
("Select “Yes” if you represent an election office. Select “No” if you don’t."),
|
||||
code="required",
|
||||
)
|
||||
return is_election_board
|
||||
|
|
@ -260,18 +248,13 @@ class OrganizationContactForm(RegistrarForm):
|
|||
)
|
||||
city = forms.CharField(
|
||||
label="City",
|
||||
error_messages={
|
||||
"required": "Enter the city where your organization is located."
|
||||
},
|
||||
error_messages={"required": "Enter the city where your organization is located."},
|
||||
)
|
||||
state_territory = forms.ChoiceField(
|
||||
label="State, territory, or military post",
|
||||
choices=[("", "--Select--")] + DomainApplication.StateTerritoryChoices.choices,
|
||||
error_messages={
|
||||
"required": (
|
||||
"Select the state, territory, or military post where your organization"
|
||||
" is located."
|
||||
)
|
||||
"required": ("Select the state, territory, or military post where your organization is located.")
|
||||
},
|
||||
)
|
||||
zipcode = forms.CharField(
|
||||
|
|
@ -320,9 +303,7 @@ class AboutYourOrganizationForm(RegistrarForm):
|
|||
message="Response must be less than 1000 characters.",
|
||||
)
|
||||
],
|
||||
error_messages={
|
||||
"required": ("Enter more information about your organization.")
|
||||
},
|
||||
error_messages={"required": ("Enter more information about your organization.")},
|
||||
)
|
||||
|
||||
|
||||
|
|
@ -346,11 +327,7 @@ class AuthorizingOfficialForm(RegistrarForm):
|
|||
|
||||
first_name = forms.CharField(
|
||||
label="First name / given name",
|
||||
error_messages={
|
||||
"required": (
|
||||
"Enter the first name / given name of your authorizing official."
|
||||
)
|
||||
},
|
||||
error_messages={"required": ("Enter the first name / given name of your authorizing official.")},
|
||||
)
|
||||
middle_name = forms.CharField(
|
||||
required=False,
|
||||
|
|
@ -358,11 +335,7 @@ class AuthorizingOfficialForm(RegistrarForm):
|
|||
)
|
||||
last_name = forms.CharField(
|
||||
label="Last name / family name",
|
||||
error_messages={
|
||||
"required": (
|
||||
"Enter the last name / family name of your authorizing official."
|
||||
)
|
||||
},
|
||||
error_messages={"required": ("Enter the last name / family name of your authorizing official.")},
|
||||
)
|
||||
title = forms.CharField(
|
||||
label="Title or role in your organization",
|
||||
|
|
@ -375,17 +348,11 @@ class AuthorizingOfficialForm(RegistrarForm):
|
|||
)
|
||||
email = forms.EmailField(
|
||||
label="Email",
|
||||
error_messages={
|
||||
"invalid": (
|
||||
"Enter an email address in the required format, like name@example.com."
|
||||
)
|
||||
},
|
||||
error_messages={"invalid": ("Enter an email address in the required format, like name@example.com.")},
|
||||
)
|
||||
phone = PhoneNumberField(
|
||||
label="Phone",
|
||||
error_messages={
|
||||
"required": "Enter the phone number for your authorizing official."
|
||||
},
|
||||
error_messages={"required": "Enter the phone number for your authorizing official."},
|
||||
)
|
||||
|
||||
|
||||
|
|
@ -394,10 +361,7 @@ class CurrentSitesForm(RegistrarForm):
|
|||
required=False,
|
||||
label="Public website",
|
||||
error_messages={
|
||||
"invalid": (
|
||||
"Enter your organization's current website in the required format, like"
|
||||
" www.city.com."
|
||||
)
|
||||
"invalid": ("Enter your organization's current website in the required format, like www.city.com.")
|
||||
},
|
||||
)
|
||||
|
||||
|
|
@ -410,9 +374,7 @@ class BaseCurrentSitesFormSet(RegistrarFormSet):
|
|||
return website.strip() == ""
|
||||
|
||||
def to_database(self, obj: DomainApplication):
|
||||
self._to_database(
|
||||
obj, self.JOIN, self.should_delete, self.pre_update, self.pre_create
|
||||
)
|
||||
self._to_database(obj, self.JOIN, self.should_delete, self.pre_update, self.pre_create)
|
||||
|
||||
@classmethod
|
||||
def from_database(cls, obj):
|
||||
|
|
@ -434,13 +396,9 @@ class AlternativeDomainForm(RegistrarForm):
|
|||
requested = self.cleaned_data.get("alternative_domain", None)
|
||||
validated = DraftDomain.validate(requested, blank_ok=True)
|
||||
except errors.ExtraDotsError:
|
||||
raise forms.ValidationError(
|
||||
DOMAIN_API_MESSAGES["extra_dots"], code="extra_dots"
|
||||
)
|
||||
raise forms.ValidationError(DOMAIN_API_MESSAGES["extra_dots"], code="extra_dots")
|
||||
except errors.DomainUnavailableError:
|
||||
raise forms.ValidationError(
|
||||
DOMAIN_API_MESSAGES["unavailable"], code="unavailable"
|
||||
)
|
||||
raise forms.ValidationError(DOMAIN_API_MESSAGES["unavailable"], code="unavailable")
|
||||
except ValueError:
|
||||
raise forms.ValidationError(DOMAIN_API_MESSAGES["invalid"], code="invalid")
|
||||
return validated
|
||||
|
|
@ -471,9 +429,7 @@ class BaseAlternativeDomainFormSet(RegistrarFormSet):
|
|||
return {}
|
||||
|
||||
def to_database(self, obj: DomainApplication):
|
||||
self._to_database(
|
||||
obj, self.JOIN, self.should_delete, self.pre_update, self.pre_create
|
||||
)
|
||||
self._to_database(obj, self.JOIN, self.should_delete, self.pre_update, self.pre_create)
|
||||
|
||||
@classmethod
|
||||
def on_fetch(cls, query):
|
||||
|
|
@ -523,17 +479,11 @@ class DotGovDomainForm(RegistrarForm):
|
|||
requested = self.cleaned_data.get("requested_domain", None)
|
||||
validated = DraftDomain.validate(requested)
|
||||
except errors.BlankValueError:
|
||||
raise forms.ValidationError(
|
||||
DOMAIN_API_MESSAGES["required"], code="required"
|
||||
)
|
||||
raise forms.ValidationError(DOMAIN_API_MESSAGES["required"], code="required")
|
||||
except errors.ExtraDotsError:
|
||||
raise forms.ValidationError(
|
||||
DOMAIN_API_MESSAGES["extra_dots"], code="extra_dots"
|
||||
)
|
||||
raise forms.ValidationError(DOMAIN_API_MESSAGES["extra_dots"], code="extra_dots")
|
||||
except errors.DomainUnavailableError:
|
||||
raise forms.ValidationError(
|
||||
DOMAIN_API_MESSAGES["unavailable"], code="unavailable"
|
||||
)
|
||||
raise forms.ValidationError(DOMAIN_API_MESSAGES["unavailable"], code="unavailable")
|
||||
except ValueError:
|
||||
raise forms.ValidationError(DOMAIN_API_MESSAGES["invalid"], code="invalid")
|
||||
return validated
|
||||
|
|
@ -551,9 +501,7 @@ class PurposeForm(RegistrarForm):
|
|||
message="Response must be less than 1000 characters.",
|
||||
)
|
||||
],
|
||||
error_messages={
|
||||
"required": "Describe how you'll use the .gov domain you’re requesting."
|
||||
},
|
||||
error_messages={"required": "Describe how you'll use the .gov domain you’re requesting."},
|
||||
)
|
||||
|
||||
|
||||
|
|
@ -590,20 +538,12 @@ class YourContactForm(RegistrarForm):
|
|||
title = forms.CharField(
|
||||
label="Title or role in your organization",
|
||||
error_messages={
|
||||
"required": (
|
||||
"Enter your title or role in your organization (e.g., Chief Information"
|
||||
" Officer)."
|
||||
)
|
||||
"required": ("Enter your title or role in your organization (e.g., Chief Information Officer).")
|
||||
},
|
||||
)
|
||||
email = forms.EmailField(
|
||||
label="Email",
|
||||
error_messages={
|
||||
"invalid": (
|
||||
"Enter your email address in the required format, like"
|
||||
" name@example.com."
|
||||
)
|
||||
},
|
||||
error_messages={"invalid": ("Enter your email address in the required format, like name@example.com.")},
|
||||
)
|
||||
phone = PhoneNumberField(
|
||||
label="Phone",
|
||||
|
|
@ -614,9 +554,7 @@ class YourContactForm(RegistrarForm):
|
|||
class OtherContactsForm(RegistrarForm):
|
||||
first_name = forms.CharField(
|
||||
label="First name / given name",
|
||||
error_messages={
|
||||
"required": "Enter the first name / given name of this contact."
|
||||
},
|
||||
error_messages={"required": "Enter the first name / given name of this contact."},
|
||||
)
|
||||
middle_name = forms.CharField(
|
||||
required=False,
|
||||
|
|
@ -624,26 +562,19 @@ class OtherContactsForm(RegistrarForm):
|
|||
)
|
||||
last_name = forms.CharField(
|
||||
label="Last name / family name",
|
||||
error_messages={
|
||||
"required": "Enter the last name / family name of this contact."
|
||||
},
|
||||
error_messages={"required": "Enter the last name / family name of this contact."},
|
||||
)
|
||||
title = forms.CharField(
|
||||
label="Title or role in your organization",
|
||||
error_messages={
|
||||
"required": (
|
||||
"Enter the title or role in your organization of this contact (e.g.,"
|
||||
" Chief Information Officer)."
|
||||
"Enter the title or role in your organization of this contact (e.g., Chief Information Officer)."
|
||||
)
|
||||
},
|
||||
)
|
||||
email = forms.EmailField(
|
||||
label="Email",
|
||||
error_messages={
|
||||
"invalid": (
|
||||
"Enter an email address in the required format, like name@example.com."
|
||||
)
|
||||
},
|
||||
error_messages={"invalid": ("Enter an email address in the required format, like name@example.com.")},
|
||||
)
|
||||
phone = PhoneNumberField(
|
||||
label="Phone",
|
||||
|
|
@ -659,9 +590,7 @@ class BaseOtherContactsFormSet(RegistrarFormSet):
|
|||
return all(empty)
|
||||
|
||||
def to_database(self, obj: DomainApplication):
|
||||
self._to_database(
|
||||
obj, self.JOIN, self.should_delete, self.pre_update, self.pre_create
|
||||
)
|
||||
self._to_database(obj, self.JOIN, self.should_delete, self.pre_update, self.pre_create)
|
||||
|
||||
@classmethod
|
||||
def from_database(cls, obj):
|
||||
|
|
@ -706,9 +635,6 @@ class RequirementsForm(RegistrarForm):
|
|||
is_policy_acknowledged = forms.BooleanField(
|
||||
label="I read and agree to the requirements for operating .gov domains.",
|
||||
error_messages={
|
||||
"required": (
|
||||
"Check the box if you read and agree to the requirements for"
|
||||
" operating .gov domains."
|
||||
)
|
||||
"required": ("Check the box if you read and agree to the requirements for operating .gov domains.")
|
||||
},
|
||||
)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue