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

Merge pull request #1129 from cisagov/za/1096-update-domain-button-text

Browse source 
Ticket #1096: Small content changes for Domain buttons
This commit is contained in:
zandercymatics 2023-10-10 13:17:57 -06:00 • committed by GitHub
commit f1751b1ee7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/registrar/admin.py
View file

@ -811,7 +811,8 @@ class DomainAdmin(ListHeaderAdmin):
else: else:
self.message_user( self.message_user(
request, request,
("Domain statuses are %s" ". Thanks!") % statuses, f"The registry statuses are {statuses}. "
"These statuses are from the provider of the .gov registry.",
) )
return HttpResponseRedirect(".") return HttpResponseRedirect(".")

1
src/registrar/models/domain.py
View file

@ -718,7 +718,6 @@ class Domain(TimeStampedModel, DomainHelper):
if not isinstance(contact, eppInfo.InfoContactResultData): if not isinstance(contact, eppInfo.InfoContactResultData):
raise ContactError("Contact must be of type InfoContactResultData") raise ContactError("Contact must be of type InfoContactResultData")
auth_info = contact.auth_info auth_info = contact.auth_info
postal_info = contact.postal_info postal_info = contact.postal_info
addr = postal_info.addr addr = postal_info.addr

6
src/registrar/templates/django/admin/domain_change_form.html
View file

@ -13,10 +13,10 @@
{% elif original.state == original.State.ON_HOLD %} {% elif original.state == original.State.ON_HOLD %}
<input type="submit" value="Remove hold" name="_remove_client_hold"> <input type="submit" value="Remove hold" name="_remove_client_hold">
{% endif %} {% endif %}
<input id="manageDomainSubmitButton" type="submit" value="Manage Domain" name="_edit_domain"> <input id="manageDomainSubmitButton" type="submit" value="Manage domain" name="_edit_domain">
<input type="submit" value="get status" name="_get_status"> <input type="submit" value="Get registry status" name="_get_status">
{% if original.state != original.State.DELETED %} {% if original.state != original.State.DELETED %}
<input type="submit" value="Delete Domain in Registry" name="_delete_domain"> <input type="submit" value="Delete domain in registry" name="_delete_domain">
{% endif %} {% endif %}
</div> </div>
{{ block.super }} {{ block.super }}

14
src/registrar/tests/test_admin.py
View file

@ -109,12 +109,12 @@ class TestDomainAdmin(MockEppLib):
) )
self.assertEqual(response.status_code, 200) self.assertEqual(response.status_code, 200)
self.assertContains(response, domain.name) self.assertContains(response, domain.name)
self.assertContains(response, "Delete Domain in Registry") self.assertContains(response, "Delete domain in registry")
# Test the info dialog # Test the info dialog
request = self.factory.post( request = self.factory.post(
"/admin/registrar/domain/{}/change/".format(domain.pk), "/admin/registrar/domain/{}/change/".format(domain.pk),
{"_delete_domain": "Delete Domain in Registry", "name": domain.name}, {"_delete_domain": "Delete domain in registry", "name": domain.name},
follow=True, follow=True,
) )
request.user = self.client request.user = self.client
@ -149,12 +149,12 @@ class TestDomainAdmin(MockEppLib):
) )
self.assertEqual(response.status_code, 200) self.assertEqual(response.status_code, 200)
self.assertContains(response, domain.name) self.assertContains(response, domain.name)
self.assertContains(response, "Delete Domain in Registry") self.assertContains(response, "Delete domain in registry")
# Test the error # Test the error
request = self.factory.post( request = self.factory.post(
"/admin/registrar/domain/{}/change/".format(domain.pk), "/admin/registrar/domain/{}/change/".format(domain.pk),
{"_delete_domain": "Delete Domain in Registry", "name": domain.name}, {"_delete_domain": "Delete domain in registry", "name": domain.name},
follow=True, follow=True,
) )
request.user = self.client request.user = self.client
@ -194,12 +194,12 @@ class TestDomainAdmin(MockEppLib):
) )
self.assertEqual(response.status_code, 200) self.assertEqual(response.status_code, 200)
self.assertContains(response, domain.name) self.assertContains(response, domain.name)
self.assertContains(response, "Delete Domain in Registry") self.assertContains(response, "Delete domain in registry")
# Test the info dialog # Test the info dialog
request = self.factory.post( request = self.factory.post(
"/admin/registrar/domain/{}/change/".format(domain.pk), "/admin/registrar/domain/{}/change/".format(domain.pk),
{"_delete_domain": "Delete Domain in Registry", "name": domain.name}, {"_delete_domain": "Delete domain in registry", "name": domain.name},
follow=True, follow=True,
) )
request.user = self.client request.user = self.client
@ -221,7 +221,7 @@ class TestDomainAdmin(MockEppLib):
# Test the info dialog # Test the info dialog
request = self.factory.post( request = self.factory.post(
"/admin/registrar/domain/{}/change/".format(domain.pk), "/admin/registrar/domain/{}/change/".format(domain.pk),
{"_delete_domain": "Delete Domain in Registry", "name": domain.name}, {"_delete_domain": "Delete domain in registry", "name": domain.name},
follow=True, follow=True,
) )
request.user = self.client request.user = self.client