Domains
{% include "includes/domains_table.html" with portfolio=portfolio user_domain_count=user_domain_count %} diff --git a/src/registrar/templates/portfolio_no_domains.html b/src/registrar/templates/portfolio_no_domains.html index e9b0da306..75ff3a91f 100644 --- a/src/registrar/templates/portfolio_no_domains.html +++ b/src/registrar/templates/portfolio_no_domains.html @@ -5,6 +5,12 @@ {% block title %} Domains | {% endblock %} {% block portfolio_content %} + +{% block messages %} + {% include "includes/form_messages.html" %} +{% endblock %} + +Domains
Organization
-The name of your federal agency will be publicly listed as the domain registrant.
+The name of your organization will be publicly listed as the domain registrant.
{% if has_edit_org_portfolio_permission %}- The federal agency for your organization can’t be updated here. + Your organization name can’t be updated here. To suggest an update, email help@get.gov.
{% include "includes/form_errors.html" with form=form %} {% include "includes/required_fields.html" %} - {% else %} -Federal agency
+Organization name
{{ portfolio.federal_agency }}
diff --git a/src/registrar/templates/portfolio_requests.html b/src/registrar/templates/portfolio_requests.html index 70d17feae..d21bbcc4e 100644 --- a/src/registrar/templates/portfolio_requests.html +++ b/src/registrar/templates/portfolio_requests.html @@ -9,6 +9,10 @@ {% endblock %} {% block portfolio_content %} +{% block messages %} + {% include "includes/form_messages.html" %} +{% endblock %} +Domain requests
") @less_console_noise_decorator def test_domain_org_name_address_content(self): @@ -1615,7 +1617,7 @@ class TestDomainSuborganization(TestDomainOverview): # Test for the title change self.assertContains(page, "Suborganization") - self.assertNotContains(page, "Organization name") + self.assertNotContains(page, "Organization") # Test for the good value self.assertContains(page, "Ice Cream") diff --git a/src/registrar/tests/test_views_portfolio.py b/src/registrar/tests/test_views_portfolio.py index b8392a370..abb8f8178 100644 --- a/src/registrar/tests/test_views_portfolio.py +++ b/src/registrar/tests/test_views_portfolio.py @@ -200,7 +200,7 @@ class TestPortfolio(WebTest): # Assert the response is a 200 self.assertEqual(response.status_code, 200) # The label for Federal agency will always be a h4 - self.assertContains(response, '
Federal agency
') + self.assertContains(response, 'Organization name
') # The read only label for city will be a h4 self.assertContains(response, 'City
') self.assertNotContains(response, 'for="id_city"') @@ -225,10 +225,10 @@ class TestPortfolio(WebTest): # Assert the response is a 200 self.assertEqual(response.status_code, 200) # The label for Federal agency will always be a h4 - self.assertContains(response, 'Federal agency
') + self.assertContains(response, 'Organization name
') # The read only label for city will be a h4 self.assertNotContains(response, 'City
') - self.assertNotContains(response, 'Los Angeles
>') + self.assertNotContains(response, 'Los Angeles
') self.assertContains(response, 'for="id_city"') @less_console_noise_decorator @@ -342,9 +342,7 @@ class TestPortfolio(WebTest): user=self.user, portfolio=self.portfolio, additional_permissions=portfolio_additional_permissions ) page = self.app.get(reverse("organization")) - self.assertContains( - page, "The name of your federal agency will be publicly listed as the domain registrant." - ) + self.assertContains(page, "The name of your organization will be publicly listed as the domain registrant.") @less_console_noise_decorator def test_domain_org_name_address_content(self): diff --git a/src/registrar/views/domain.py b/src/registrar/views/domain.py index 174f01ecc..db0572bb3 100644 --- a/src/registrar/views/domain.py +++ b/src/registrar/views/domain.py @@ -204,7 +204,7 @@ class DomainView(DomainBaseView): class DomainOrgNameAddressView(DomainFormBaseView): - """Organization name and mailing address view""" + """Organization view""" model = Domain template_name = "domain_org_name_address.html" diff --git a/src/registrar/views/domain_request.py b/src/registrar/views/domain_request.py index 06c0a7fc7..4fe59c70c 100644 --- a/src/registrar/views/domain_request.py +++ b/src/registrar/views/domain_request.py @@ -83,7 +83,7 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView): Step.TRIBAL_GOVERNMENT: _("Tribal government"), Step.ORGANIZATION_FEDERAL: _("Federal government branch"), Step.ORGANIZATION_ELECTION: _("Election office"), - Step.ORGANIZATION_CONTACT: _("Organization name and mailing address"), + Step.ORGANIZATION_CONTACT: _("Organization"), Step.ABOUT_YOUR_ORGANIZATION: _("About your organization"), Step.SENIOR_OFFICIAL: _("Senior official"), Step.CURRENT_SITES: _("Current websites"),