zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-06-12 07:24:48 +02:00
Code Issues Projects Releases Packages Wiki Activity

Cleanup

Browse source
This commit is contained in:
zandercymatics 2024-09-19 15:41:02 -06:00
parent 2c102f94d5
commit 26db5151ca
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
6 changed files with 30 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/registrar/config/urls.py
View file

@ -22,7 +22,7 @@ from registrar.views.report_views import (
ExportDataTypeUser, ExportDataTypeUser,
) )
from registrar.views.domain_request import DomainRequestStep from registrar.views.domain_request import Step
from registrar.views.domain_requests_json import get_domain_requests_json from registrar.views.domain_requests_json import get_domain_requests_json
from registrar.views.transfer_user import TransferUserView from registrar.views.transfer_user import TransferUserView
from registrar.views.utility.api_views import ( from registrar.views.utility.api_views import (
@ -43,20 +43,20 @@ domain_request_urls = [
# dynamically generate the other domain_request_urls # dynamically generate the other domain_request_urls
for step, view in [ for step, view in [
# add/remove steps here # add/remove steps here
(DomainRequestStep.ORGANIZATION_TYPE, views.OrganizationType), (Step.ORGANIZATION_TYPE, views.OrganizationType),
(DomainRequestStep.TRIBAL_GOVERNMENT, views.TribalGovernment), (Step.TRIBAL_GOVERNMENT, views.TribalGovernment),
(DomainRequestStep.ORGANIZATION_FEDERAL, views.OrganizationFederal), (Step.ORGANIZATION_FEDERAL, views.OrganizationFederal),
(DomainRequestStep.ORGANIZATION_ELECTION, views.OrganizationElection), (Step.ORGANIZATION_ELECTION, views.OrganizationElection),
(DomainRequestStep.ORGANIZATION_CONTACT, views.OrganizationContact), (Step.ORGANIZATION_CONTACT, views.OrganizationContact),
(DomainRequestStep.ABOUT_YOUR_ORGANIZATION, views.AboutYourOrganization), (Step.ABOUT_YOUR_ORGANIZATION, views.AboutYourOrganization),
(DomainRequestStep.SENIOR_OFFICIAL, views.SeniorOfficial), (Step.SENIOR_OFFICIAL, views.SeniorOfficial),
(DomainRequestStep.CURRENT_SITES, views.CurrentSites), (Step.CURRENT_SITES, views.CurrentSites),
(DomainRequestStep.DOTGOV_DOMAIN, views.DotgovDomain), (Step.DOTGOV_DOMAIN, views.DotgovDomain),
(DomainRequestStep.PURPOSE, views.Purpose), (Step.PURPOSE, views.Purpose),
(DomainRequestStep.OTHER_CONTACTS, views.OtherContacts), (Step.OTHER_CONTACTS, views.OtherContacts),
(DomainRequestStep.ADDITIONAL_DETAILS, views.AdditionalDetails), (Step.ADDITIONAL_DETAILS, views.AdditionalDetails),
(DomainRequestStep.REQUIREMENTS, views.Requirements), (Step.REQUIREMENTS, views.Requirements),
(DomainRequestStep.REVIEW, views.Review), (Step.REVIEW, views.Review),
]: ]:
domain_request_urls.append(path(f"{step}/", view.as_view(), name=step)) domain_request_urls.append(path(f"{step}/", view.as_view(), name=step))

2
src/registrar/forms/utility/wizard_form_helper.py
View file

@ -4,7 +4,7 @@ from itertools import zip_longest
from typing import Callable from typing import Callable
from django.db.models.fields.related import ForeignObjectRel from django.db.models.fields.related import ForeignObjectRel
from django import forms from django import forms
from registrar.utility.enums import DomainRequestStep from registrar.utility.enums import Step
from registrar.models import DomainRequest, Contact from registrar.models import DomainRequest, Contact

14
src/registrar/templates/includes/summary_item.html
View file

@ -43,12 +43,12 @@
{% endfor %} {% endfor %}
</dl> </dl>
{% elif custom_text_for_value_none %} {% elif custom_text_for_value_none %}
<p class="red-incomplete-text"> <p>
{{ custom_text_for_value_none }} {{ custom_text_for_value_none }}
</p> </p>
{% else %} {% else %}
<p> <p>
None None
</p> </p>
{% endif %} {% endif %}
{% endif %} {% endif %}
@ -96,17 +96,15 @@
</ul> </ul>
{% endif %} {% endif %}
{% else %} {% else %}
<p class="margin-top-0 margin-bottom-0">
{% if value %} {% if value %}
<p class="margin-top-0 margin-bottom-0"> {{ value }}
{{ value }}
</p>
{% elif custom_text_for_value_none %} {% elif custom_text_for_value_none %}
<p class="margin-top-0 margin-bottom-0 red-incomplete-text"> {{ custom_text_for_value_none }}
{{ custom_text_for_value_none }}
</p>
{% else %} {% else %}
None None
{% endif %} {% endif %}
</p>
{% endif %} {% endif %}
</div> </div>

8
src/registrar/tests/test_views_request.py
View file

@ -22,7 +22,7 @@ from registrar.models import (
Portfolio, Portfolio,
UserPortfolioPermission, UserPortfolioPermission,
) )
from registrar.views.domain_request import DomainRequestWizard, DomainRequestStep from registrar.views.domain_request import DomainRequestWizard, Step
from .common import less_console_noise from .common import less_console_noise
from .test_views import TestWithUser from .test_views import TestWithUser
@ -1098,7 +1098,7 @@ class DomainRequestTests(TestWithUser, WebTest):
self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id) self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id)
contact_page = type_result.follow() contact_page = type_result.follow()
self.assertContains(contact_page, self.TITLES[DomainRequestStep.ABOUT_YOUR_ORGANIZATION]) self.assertContains(contact_page, self.TITLES[Step.ABOUT_YOUR_ORGANIZATION])
@less_console_noise_decorator @less_console_noise_decorator
def test_federal_agency_dropdown_excludes_expected_values(self): def test_federal_agency_dropdown_excludes_expected_values(self):
@ -2327,7 +2327,7 @@ class DomainRequestTests(TestWithUser, WebTest):
self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id) self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id)
contact_page = type_result.follow() contact_page = type_result.follow()
self.assertContains(contact_page, self.TITLES[DomainRequestStep.ABOUT_YOUR_ORGANIZATION]) self.assertContains(contact_page, self.TITLES[Step.ABOUT_YOUR_ORGANIZATION])
@less_console_noise_decorator @less_console_noise_decorator
def test_domain_request_tribal_government(self): def test_domain_request_tribal_government(self):
@ -2359,7 +2359,7 @@ class DomainRequestTests(TestWithUser, WebTest):
tribal_government_page = type_result.follow() tribal_government_page = type_result.follow()
# and the step is on the sidebar list. # and the step is on the sidebar list.
self.assertContains(tribal_government_page, self.TITLES[DomainRequestStep.TRIBAL_GOVERNMENT]) self.assertContains(tribal_government_page, self.TITLES[Step.TRIBAL_GOVERNMENT])
@less_console_noise_decorator @less_console_noise_decorator
def test_domain_request_so_dynamic_text(self): def test_domain_request_so_dynamic_text(self):

2
src/registrar/utility/enums.py
View file

@ -40,7 +40,7 @@ class DefaultEmail(Enum):
LEGACY_DEFAULT = "registrar@dotgov.gov" LEGACY_DEFAULT = "registrar@dotgov.gov"
class DomainRequestStep(StrEnum): class Step(StrEnum):
""" """
Names for each page of the domain request wizard. Names for each page of the domain request wizard.

6
src/registrar/views/domain_request.py
View file

@ -14,7 +14,7 @@ from registrar.models.contact import Contact
from registrar.models.user import User from registrar.models.user import User
from registrar.views.utility import StepsHelper from registrar.views.utility import StepsHelper
from registrar.views.utility.permission_views import DomainRequestPermissionDeleteView from registrar.views.utility.permission_views import DomainRequestPermissionDeleteView
from registrar.utility.enums import DomainRequestStep, PortfolioDomainRequestStep from registrar.utility.enums import Step, PortfolioDomainRequestStep
from .utility import ( from .utility import (
DomainRequestPermissionView, DomainRequestPermissionView,
@ -43,7 +43,7 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
Any method not marked as internal can be overridden in a subclass, Any method not marked as internal can be overridden in a subclass,
although not without consulting the base implementation, first. although not without consulting the base implementation, first.
""" """
StepEnum = DomainRequestStep StepEnum = Step
template_name = "" template_name = ""
# uniquely namespace the wizard in urls.py # uniquely namespace the wizard in urls.py
@ -698,7 +698,7 @@ class Review(DomainRequestWizard):
if DomainRequest._form_complete(self.domain_request, self.request) is False: if DomainRequest._form_complete(self.domain_request, self.request) is False:
logger.warning("User arrived at review page with an incomplete form.") logger.warning("User arrived at review page with an incomplete form.")
context = super().get_context_data() context = super().get_context_data()
context["Step"] = DomainRequestStep.__members__ context["Step"] = Step.__members__
context["domain_request"] = self.domain_request context["domain_request"] = self.domain_request
return context return context