zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-08-05 01:11:55 +02:00
Code Issues Projects Releases Packages Wiki Activity

merge

Browse source
This commit is contained in:
Rachid Mrad 2024-05-31 13:44:37 -04:00
commit 271ade4976
No known key found for this signature in database
4 changed files with 7 additions and 7 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.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
action_label_expected = (

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

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

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 django.utils.dateformat import format
from django.contrib.auth.decorators import login_required
from django.urls import reverse
@login_required
@ -33,14 +34,14 @@ def get_domain_requests_json(request):
"is_deletable": domain_request.status
in [DomainRequest.DomainRequestStatus.STARTED, DomainRequest.DomainRequestStatus.WITHDRAWN],
"action_url": (
f"/domain-request/{domain_request.id}/edit"
reverse("edit-domain-request", kwargs={"id": domain_request.id})
if domain_request.status
in [
DomainRequest.DomainRequestStatus.STARTED,
DomainRequest.DomainRequestStatus.ACTION_NEEDED,
DomainRequest.DomainRequestStatus.WITHDRAWN,
]
else f"/domain-request/{domain_request.id}"
else reverse("domain-request-status", kwargs={"pk": domain_request.id})
),
"action_label": (
"Edit"

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

@ -41,7 +41,7 @@ def get_domains_json(request):
"state": domain.state,
"state_display": domain.state_display(),
"get_state_help_text": domain.get_state_help_text(),
"action_url": reverse('domain', kwargs={'pk': 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"),
"svg_icon": ("visibility" if domain.state in [Domain.State.DELETED, Domain.State.ON_HOLD] else "settings"),
}