zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-08-13 21:19:42 +02:00
Code Issues Projects Releases Packages Wiki Activity

cleanup

Browse source
This commit is contained in:
Rachid Mrad 2024-05-31 13:24:56 -04:00
parent 021785911e
commit 39b52ed5b1
No known key found for this signature in database
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/registrar/tests/test_views_domains_json.py
View file

@ -76,7 +76,7 @@ class GetDomainsJsonTest(TestWithUser, WebTest):
self.assertEqual(expected_domain.state_display(), state_displays[i]) self.assertEqual(expected_domain.state_display(), state_displays[i])
self.assertEqual(expected_domain.get_state_help_text(), get_state_help_texts[i]) self.assertEqual(expected_domain.get_state_help_text(), get_state_help_texts[i])
self.assertEqual(f"/domain/{expected_domain.id}", action_urls[i]) self.assertEqual( reverse("domain", kwargs={"pk": expected_domain.id}), action_urls[i])
# Check action_label # Check action_label
action_label_expected = ( action_label_expected = (

5
src/registrar/views/domain_requests_json.py
View file

@ -3,6 +3,7 @@ from django.core.paginator import Paginator
from registrar.models import DomainRequest from registrar.models import DomainRequest
from django.utils.dateformat import format from django.utils.dateformat import format
from django.contrib.auth.decorators import login_required from django.contrib.auth.decorators import login_required
from django.urls import reverse
@login_required @login_required
@ -33,14 +34,14 @@ def get_domain_requests_json(request):
"is_deletable": domain_request.status "is_deletable": domain_request.status
in [DomainRequest.DomainRequestStatus.STARTED, DomainRequest.DomainRequestStatus.WITHDRAWN], in [DomainRequest.DomainRequestStatus.STARTED, DomainRequest.DomainRequestStatus.WITHDRAWN],
"action_url": ( "action_url": (
f"/domain-request/{domain_request.id}/edit" reverse("edit-domain-request", kwargs={"pk": domain_requests.id})
if domain_request.status if domain_request.status
in [ in [
DomainRequest.DomainRequestStatus.STARTED, DomainRequest.DomainRequestStatus.STARTED,
DomainRequest.DomainRequestStatus.ACTION_NEEDED, DomainRequest.DomainRequestStatus.ACTION_NEEDED,
DomainRequest.DomainRequestStatus.WITHDRAWN, DomainRequest.DomainRequestStatus.WITHDRAWN,
] ]
else f"/domain-request/{domain_request.id}" else reverse("domain-request-status", kwargs={"pk": domain_request.id})
), ),
"action_label": ( "action_label": (
"Edit" "Edit"