- {% comment %}
- TODO: Uncomment in #2596
{% if portfolio %}
{% url 'domain-requests' as url %}
- {% else %}{% endcomment %}
+ {% else %}
{% url 'home' as url %}
-
- {% if not DomainRequest.requested_domain and DomainRequest.status == DomainRequest.DomainRequestStatus.STARTED %}
-
- {% if DomainRequest.creator and DomainRequest.creator != request.user %} -
New domain request
- {% else %} -Domain request for {{ DomainRequest.requested_domain.name }}
{% endif %} + +Domain request for {{ DomainRequest.requested_domain.name }}
- {% if DomainRequest.creator and DomainRequest.creator != request.user %} -
- Created by: {{DomainRequest.creator.email|default:DomainRequest.creator.get_formatted_name }} -
- {% endif %} - {% with statuses=DomainRequest.DomainRequestStatus last_submitted=DomainRequest.last_submitted_date|date:"F j, Y" first_submitted=DomainRequest.first_submitted_date|date:"F j, Y" last_status_update=DomainRequest.last_status_update|date:"F j, Y" %} {% comment %} These are intentionally seperated this way. From e5f26e5667901f838f14c3e0563513f40f232676 Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Tue, 17 Sep 2024 11:31:03 -0600 Subject: [PATCH 11/14] add subpage tests --- src/registrar/tests/test_templatetags.py | 18 ++++++++++++++++++ src/registrar/tests/test_views_request.py | 8 -------- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src/registrar/tests/test_templatetags.py b/src/registrar/tests/test_templatetags.py index a3f141e6b..ecd8accbd 100644 --- a/src/registrar/tests/test_templatetags.py +++ b/src/registrar/tests/test_templatetags.py @@ -9,6 +9,9 @@ from registrar.templatetags.custom_filters import ( find_index, slice_after, contains_checkbox, + is_domain_request_subpage, + is_domain_subpage, + is_portfolio_subpage, ) @@ -90,3 +93,18 @@ class CustomFiltersTestCase(TestCase): ] result = contains_checkbox(html_list) self.assertFalse(result) # Expecting False + + def test_is_domain_subpage(self): + """Tests if the path is recognized as a domain subpage.""" + self.assertTrue(is_domain_subpage("/domains/")) + self.assertFalse(is_domain_subpage("/")) + + def test_is_domain_request_subpage(self): + """Tests if the path is recognized as a domain request subpage.""" + self.assertTrue(is_domain_request_subpage("/requests/")) + self.assertFalse(is_domain_request_subpage("/")) + + def test_is_portfolio_subpage(self): + """Tests if the path is recognized as a portfolio subpage.""" + self.assertTrue(is_portfolio_subpage("/organization/")) + self.assertFalse(is_portfolio_subpage("/")) diff --git a/src/registrar/tests/test_views_request.py b/src/registrar/tests/test_views_request.py index 9b7086260..5c7cae6f9 100644 --- a/src/registrar/tests/test_views_request.py +++ b/src/registrar/tests/test_views_request.py @@ -96,14 +96,6 @@ class DomainRequestTests(TestWithUser, WebTest): self.assertContains(response, "Started on:") self.assertContains(response, domain_request.last_status_update.strftime("%B %-d, %Y")) - def test_template_new_domain_request_display(self): - """Tests the display of the new domain request header.""" - domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.STARTED, user=self.user) - domain_request.requested_domain = None - domain_request.save() - response = self.app.get(f"/domain-request/{domain_request.id}") - self.assertContains(response, "New domain request") - @less_console_noise_decorator def test_domain_request_form_intro_is_skipped_when_edit_access(self): """Tests that user is NOT presented with intro acknowledgement page when accessed through 'edit'""" From 124895490f59cf96eb0a97ee9630a09f194538b4 Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Tue, 17 Sep 2024 11:46:43 -0600 Subject: [PATCH 12/14] add breadcrumb for everyone --- .../templates/domain_request_status.html | 39 +++++++------------ 1 file changed, 15 insertions(+), 24 deletions(-) diff --git a/src/registrar/templates/domain_request_status.html b/src/registrar/templates/domain_request_status.html index 0a67d687a..da470924b 100644 --- a/src/registrar/templates/domain_request_status.html +++ b/src/registrar/templates/domain_request_status.html @@ -10,32 +10,23 @@
{% if portfolio %}
{% url 'domain-requests' as url %}
-
{% else %}
- {% url 'home' as url %}
-
-
-
-
- Back to manage your domains -
- + {% url 'home' as url %} {% endif %} +Domain request for {{ DomainRequest.requested_domain.name }}
Date: Tue, 17 Sep 2024 11:54:06 -0600
Subject: [PATCH 13/14] lint
---
src/registrar/tests/test_templatetags.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/registrar/tests/test_templatetags.py b/src/registrar/tests/test_templatetags.py
index ecd8accbd..1ec63dcce 100644
--- a/src/registrar/tests/test_templatetags.py
+++ b/src/registrar/tests/test_templatetags.py
@@ -93,17 +93,17 @@ class CustomFiltersTestCase(TestCase):
]
result = contains_checkbox(html_list)
self.assertFalse(result) # Expecting False
-
+
def test_is_domain_subpage(self):
"""Tests if the path is recognized as a domain subpage."""
self.assertTrue(is_domain_subpage("/domains/"))
self.assertFalse(is_domain_subpage("/"))
-
+
def test_is_domain_request_subpage(self):
"""Tests if the path is recognized as a domain request subpage."""
self.assertTrue(is_domain_request_subpage("/requests/"))
self.assertFalse(is_domain_request_subpage("/"))
-
+
def test_is_portfolio_subpage(self):
"""Tests if the path is recognized as a portfolio subpage."""
self.assertTrue(is_portfolio_subpage("/organization/"))
From 11c726872219bf13214d6a51534dea37f7b76ffc Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Tue, 17 Sep 2024 12:01:12 -0600
Subject: [PATCH 14/14] Update domain_request_status.html
---
src/registrar/templates/domain_request_status.html | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/registrar/templates/domain_request_status.html b/src/registrar/templates/domain_request_status.html
index da470924b..803975b39 100644
--- a/src/registrar/templates/domain_request_status.html
+++ b/src/registrar/templates/domain_request_status.html
@@ -16,7 +16,11 @@