{% if step == Step.ORGANIZATION_TYPE %}
- {{ application.get_organization_type_display|default:"Incomplete" }}
+ {% if application.organization_type is not None %}
+ {% with long_org_type=application.organization_type|get_organization_long_name %}
+ {{ long_org_type }}
+ {% endwith %}
+ {% else %}
+ Incomplete
+ {% endif %}
{% endif %}
{% if step == Step.TRIBAL_GOVERNMENT %}
{{ application.tribe_name|default:"Incomplete" }}
diff --git a/src/registrar/templates/application_status.html b/src/registrar/templates/application_status.html
index a68c07c8a..79d0f7ff9 100644
--- a/src/registrar/templates/application_status.html
+++ b/src/registrar/templates/application_status.html
@@ -1,5 +1,7 @@
{% extends 'base.html' %}
+{% load custom_filters %}
+
{% block title %}Domain request status | {{ domainapplication.requested_domain.name }} | {% endblock %}
{% load static url_helpers %}
@@ -50,7 +52,9 @@
Summary of your domain request
{% with heading_level='h3' %}
- {% include "includes/summary_item.html" with title='Type of organization' value=domainapplication.get_organization_type_display heading_level=heading_level %}
+ {% with long_org_type=domainapplication.organization_type|get_organization_long_name %}
+ {% include "includes/summary_item.html" with title='Type of organization' value=long_org_type heading_level=heading_level %}
+ {% endwith %}
{% if domainapplication.tribe_name %}
{% include "includes/summary_item.html" with title='Tribal government' value=domainapplication.tribe_name heading_level=heading_level %}
diff --git a/src/registrar/templatetags/custom_filters.py b/src/registrar/templatetags/custom_filters.py
index 3614db18e..e90c3166d 100644
--- a/src/registrar/templatetags/custom_filters.py
+++ b/src/registrar/templatetags/custom_filters.py
@@ -1,5 +1,6 @@
from django import template
import re
+from registrar.models.domain_application import DomainApplication
register = template.Library()
@@ -48,3 +49,17 @@ def contains_checkbox(html_list):
if re.search(r']*type="checkbox"', html_string):
return True
return False
+
+
+@register.filter
+def get_organization_long_name(organization_type):
+ organization_choices_dict = {}
+
+ for name, value in DomainApplication.OrganizationChoicesVerbose.choices:
+ organization_choices_dict[name] = value
+
+ long_form_type = organization_choices_dict[organization_type]
+ if long_form_type is not None:
+ return long_form_type
+
+ return "Error"
diff --git a/src/registrar/tests/test_admin.py b/src/registrar/tests/test_admin.py
index 51ace34f7..b5827d3e9 100644
--- a/src/registrar/tests/test_admin.py
+++ b/src/registrar/tests/test_admin.py
@@ -300,6 +300,23 @@ class TestDomainApplicationAdmin(MockEppLib):
self.superuser = create_superuser()
self.staffuser = create_user()
+ def test_short_org_name_in_applications_list(self):
+ """
+ Make sure the short name is displaying in admin on the list page
+ """
+ self.client.force_login(self.superuser)
+ completed_application()
+ response = self.client.get("/admin/registrar/domainapplication/")
+ # There are 3 template references to Federal (3) plus one reference in the table
+ # for our actual application
+ self.assertContains(response, "Federal", count=4)
+ # This may be a bit more robust
+ self.assertContains(
+ response, 'Federal | ', count=1
+ )
+ # Now let's make sure the long description does not exist
+ self.assertNotContains(response, "Federal: an agency of the U.S. government")
+
@boto3_mocking.patching
def test_save_model_sends_submitted_email(self):
# make sure there is no user with this email
diff --git a/src/registrar/tests/test_views.py b/src/registrar/tests/test_views.py
index 2194b42db..32a22916e 100644
--- a/src/registrar/tests/test_views.py
+++ b/src/registrar/tests/test_views.py
@@ -141,9 +141,12 @@ class DomainApplicationTests(TestWithUser, WebTest):
@boto3_mocking.patching
def test_application_form_submission(self):
- """Can fill out the entire form and submit.
+ """
+ Can fill out the entire form and submit.
As we add additional form pages, we need to include them here to make
this test work.
+
+ This test also looks for the long organization name on the summary page.
"""
num_pages_tested = 0
# elections, type_of_work, tribal_government, no_other_contacts
@@ -427,7 +430,8 @@ class DomainApplicationTests(TestWithUser, WebTest):
review_form = review_page.form
# Review page contains all the previously entered data
- self.assertContains(review_page, "Federal")
+ # Let's make sure the long org name is displayed
+ self.assertContains(review_page, "Federal: an agency of the U.S. government")
self.assertContains(review_page, "Executive")
self.assertContains(review_page, "Testorg")
self.assertContains(review_page, "address 1")
@@ -1065,6 +1069,26 @@ class DomainApplicationTests(TestWithUser, WebTest):
# page = self.app.get(url)
# self.assertNotContains(page, "VALUE")
+ def test_long_org_name_in_application(self):
+ """
+ Make sure the long name is displaying in the application form,
+ org step
+ """
+ request = self.app.get(reverse("application:")).follow()
+ self.assertContains(request, "Federal: an agency of the U.S. government")
+
+ def test_long_org_name_in_application_manage(self):
+ """
+ Make sure the long name is displaying in the application summary
+ page (manage your application)
+ """
+ completed_application(status=DomainApplication.SUBMITTED, user=self.user)
+ home_page = self.app.get("/")
+ self.assertContains(home_page, "city.gov")
+ # click the "Edit" link
+ detail_page = home_page.click("Manage")
+ self.assertContains(detail_page, "Federal: an agency of the U.S. government")
+
class TestWithDomainPermissions(TestWithUser):
def setUp(self):