diff --git a/src/registrar/config/urls.py b/src/registrar/config/urls.py index 1487d372a..7caa64e5c 100644 --- a/src/registrar/config/urls.py +++ b/src/registrar/config/urls.py @@ -90,11 +90,6 @@ urlpatterns = [ views.DomainNameserversView.as_view(), name="domain-dns-nameservers", ), - path( - "domain//dns/subdomains", - views.DomainSubdomainsView.as_view(), - name="domain-dns-subdomains", - ), path( "domain//dns/dnssec", views.DomainDNSSECView.as_view(), diff --git a/src/registrar/forms/domain.py b/src/registrar/forms/domain.py index eb71a00fe..d0cbb9980 100644 --- a/src/registrar/forms/domain.py +++ b/src/registrar/forms/domain.py @@ -199,11 +199,6 @@ class DomainDsdataForm(forms.Form): # ) # ], ) - - # delete = forms.BooleanField( - # required=False, - # label="Delete", - # ) # TODO: Conditional DS Key Data fields @@ -217,12 +212,6 @@ DomainDsdataFormset = formset_factory( class DomainKeydataForm(forms.Form): """Form for adding or editing DNSSEC key data.""" - # TODO: ds key data - # has_ds_key_data = forms.TypedChoiceField( - # required=True, - # label="DS Data record type", - # choices=[(False, "DS Data"), (True, "DS Data with Key Data")], - # ) flag = forms.TypedChoiceField( required=True, @@ -235,13 +224,6 @@ class DomainKeydataForm(forms.Form): label="Protocol", choices=PROTOCOL_CHOICES, ) - # protocol = forms.IntegerField( - # max_value=3, - # min_value=3, - # initial=3, - # required=True, - # disabled=True, - # ) algorithm = forms.TypedChoiceField( required=True, @@ -253,15 +235,7 @@ class DomainKeydataForm(forms.Form): required=True, label="Pub key", ) - - # delete = forms.BooleanField( - # required=False, - # label="Delete", - # ) - # TODO: Conditional DS Key Data fields - - DomainKeydataFormset = formset_factory( DomainKeydataForm, diff --git a/src/registrar/models/domain.py b/src/registrar/models/domain.py index 34f23261d..56a1a53cb 100644 --- a/src/registrar/models/domain.py +++ b/src/registrar/models/domain.py @@ -291,7 +291,7 @@ class Domain(TimeStampedModel, DomainHelper): return None @dnssecdata.setter # type: ignore - def dnssecdata(self, _dnssecdata: extensions.DNSSECExtension): + def dnssecdata(self, _dnssecdata: dict): updateParams = { "maxSigLife": _dnssecdata.get("maxSigLife", None), "dsData": _dnssecdata.get("dsData", None), diff --git a/src/registrar/templates/domain_dns.html b/src/registrar/templates/domain_dns.html index c793df5e9..0133a8b07 100644 --- a/src/registrar/templates/domain_dns.html +++ b/src/registrar/templates/domain_dns.html @@ -14,9 +14,6 @@ {% url 'domain-dns-nameservers' pk=domain.id as url %}

DNS name servers

- {% url 'domain-subdomains' pk=domain.id as url %} -

Subdomain records

- {% url 'domain-dnssec' pk=domain.id as url %}

DNSSEC

diff --git a/src/registrar/templates/domain_sidebar.html b/src/registrar/templates/domain_sidebar.html index e81186c43..d31ce613a 100644 --- a/src/registrar/templates/domain_sidebar.html +++ b/src/registrar/templates/domain_sidebar.html @@ -27,15 +27,6 @@ -
  • - {% url 'domain-dns-subdomains' pk=domain.id as url %} - - Subdomain records - -
  • -
  • {% url 'domain-dns-dnssec' pk=domain.id as url %} Subdomain records - -

    Subdomains allow you to host multiple services under the same domain and create subsets of your website. For example, blogs are often set up as a subdomain (blog.example.gov).

    - -

    Subdomains cannot be requested through the .gov registrar. Those must be set up ... NEED ADDITIONAL COPY HERE

    - -

    If you use subdomains, enter those records (also known as glue records) below.

    - -{% endblock %} {# domain_content #} diff --git a/src/registrar/views/__init__.py b/src/registrar/views/__init__.py index 8a04fa186..5bca4e1d5 100644 --- a/src/registrar/views/__init__.py +++ b/src/registrar/views/__init__.py @@ -5,7 +5,6 @@ from .domain import ( DomainOrgNameAddressView, DomainDNSView, DomainNameserversView, - DomainSubdomainsView, DomainDNSSECView, DomainDsdataView, DomainKeydataView, diff --git a/src/registrar/views/domain.py b/src/registrar/views/domain.py index 2c61248b6..53dd0714c 100644 --- a/src/registrar/views/domain.py +++ b/src/registrar/views/domain.py @@ -227,13 +227,6 @@ class DomainNameserversView(DomainPermissionView, FormMixin): return super().form_valid(formset) -class DomainSubdomainsView(DomainPermissionView): - - """Domain subdomains editing view.""" - - template_name = "domain_subdomains.html" - - class DomainDNSSECView(DomainPermissionView, FormMixin): """Domain DNSSEC editing view."""