zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-08-23 17:51:03 +02:00
Code Issues Projects Releases Packages Wiki Activity

use reverse for urls

Browse source
This commit is contained in:
Rachid Mrad 2024-05-31 12:44:38 -04:00
parent 87e2c12b20
commit f10314e7ce
No known key found for this signature in database
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/registrar/tests/test_views_requests_json.py
View file

@ -3,6 +3,7 @@ from django.urls import reverse
from .test_views import TestWithUser from .test_views import TestWithUser
from django_webtest import WebTest # type: ignore from django_webtest import WebTest # type: ignore
from django.utils.dateparse import parse_datetime from django.utils.dateparse import parse_datetime
from django.urls import reverse
class GetRequestsJsonTest(TestWithUser, WebTest): class GetRequestsJsonTest(TestWithUser, WebTest):
@ -158,14 +159,14 @@ class GetRequestsJsonTest(TestWithUser, WebTest):
# Check action_url # Check action_url
action_url_expected = ( action_url_expected = (
f"/domain-request/{self.domain_requests[i].id}/edit" reverse('domain-request/<id>/edit/', kwargs={'pk': self.domain_requests[i].id})
if self.domain_requests[i].status if self.domain_requests[i].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/{self.domain_requests[i].id}" else reverse('domain-request', kwargs={'pk': self.domain_requests[i].id})
) )
self.assertEqual(action_url_expected, action_urls[i]) self.assertEqual(action_url_expected, action_urls[i])

3
src/registrar/views/domains_json.py
View file

@ -2,6 +2,7 @@ from django.http import JsonResponse
from django.core.paginator import Paginator from django.core.paginator import Paginator
from registrar.models import UserDomainRole, Domain from registrar.models import UserDomainRole, Domain
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
@ -40,7 +41,7 @@ def get_domains_json(request):
"state": domain.state, "state": domain.state,
"state_display": domain.state_display(), "state_display": domain.state_display(),
"get_state_help_text": domain.get_state_help_text(), "get_state_help_text": domain.get_state_help_text(),
"action_url": f"/domain/{domain.id}", "action_url": reverse('domain', kwargs={'pk': domain.id}),
"action_label": ("View" if domain.state in [Domain.State.DELETED, Domain.State.ON_HOLD] else "Manage"), "action_label": ("View" if domain.state in [Domain.State.DELETED, Domain.State.ON_HOLD] else "Manage"),
"svg_icon": ("visibility" if domain.state in [Domain.State.DELETED, Domain.State.ON_HOLD] else "settings"), "svg_icon": ("visibility" if domain.state in [Domain.State.DELETED, Domain.State.ON_HOLD] else "settings"),
} }