From 9583dbca948a54cf372ffd53c0de1d3a5ef0040d Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Tue, 23 Apr 2024 11:19:30 -0600
Subject: [PATCH] Test

---
 src/registrar/admin.py                                   | 5 ++---
 src/registrar/models/domain.py                           | 9 ++++-----
 .../templates/django/admin/includes/domain_fieldset.html | 6 ++++++
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/registrar/admin.py b/src/registrar/admin.py
index 9891a7317..acfbd77f7 100644
--- a/src/registrar/admin.py
+++ b/src/registrar/admin.py
@@ -1749,12 +1749,11 @@ class DomainAdmin(ListHeaderAdmin):
             if domain is not None and hasattr(domain, "domain_info"):
                 extra_context["original_object"] = domain.domain_info
 
-            logger.info(f"changeform_view() -> state is {domain.state}")
             extra_context["state_help_message"] = Domain.State.get_admin_help_text(domain.state)
-            logger.info(f"changeform_view() -> state is now {domain.state}")
+            extra_context["domain_state"] = domain.state
+
             # Pass in what the an extended expiration date would be for the expiration date modal
             self._set_expiration_date_context(domain, extra_context)
-            logger.info(f"changeform_view() -> state is now actually {domain.state}")
 
         return super().changeform_view(request, object_id, form_url, extra_context)
 
diff --git a/src/registrar/models/domain.py b/src/registrar/models/domain.py
index d786fd16a..7f53bb234 100644
--- a/src/registrar/models/domain.py
+++ b/src/registrar/models/domain.py
@@ -278,7 +278,7 @@ class Domain(TimeStampedModel, DomainHelper):
         """Get or set the `ex_date` element from the registry.
         Additionally, _get_property updates the expiration date in the registrar"""
         try:
-            return self._get_property("ex_date", False)
+            return self._get_property("ex_date")
         except Exception as e:
             # exception raised during the save to registrar
             logger.error(f"error updating expiration date in registrar: {e}")
@@ -1770,7 +1770,7 @@ class Domain(TimeStampedModel, DomainHelper):
                 technical_contact = self.get_default_technical_contact()
                 technical_contact.save()
 
-    def _fetch_cache(self, fetch_hosts=False, fetch_contacts=False, fix_unknown=True):
+    def _fetch_cache(self, fetch_hosts=False, fetch_contacts=False):
         """Contact registry for info about a domain."""
         try:
             data_response = self._get_or_create_domain()
@@ -1778,7 +1778,7 @@ class Domain(TimeStampedModel, DomainHelper):
             cleaned = self._clean_cache(cache, data_response)
             self._update_hosts_and_contacts(cleaned, fetch_hosts, fetch_contacts)
 
-            if self.state == self.State.UNKNOWN and fix_unknown:
+            if self.state == self.State.UNKNOWN:
                 self._fix_unknown_state(cleaned)
             if fetch_hosts:
                 self._update_hosts_and_ips_in_db(cleaned)
@@ -2008,13 +2008,12 @@ class Domain(TimeStampedModel, DomainHelper):
         """Remove cache data when updates are made."""
         self._cache = {}
 
-    def _get_property(self, property, fix_unknown=True):
+    def _get_property(self, property):
         """Get some piece of info about a domain."""
         if property not in self._cache:
             self._fetch_cache(
                 fetch_hosts=(property == "hosts"),
                 fetch_contacts=(property == "contacts"),
-                fix_unknown=fix_unknown,
             )
 
         if property in self._cache:
diff --git a/src/registrar/templates/django/admin/includes/domain_fieldset.html b/src/registrar/templates/django/admin/includes/domain_fieldset.html
index 5e9464236..b191e17e7 100644
--- a/src/registrar/templates/django/admin/includes/domain_fieldset.html
+++ b/src/registrar/templates/django/admin/includes/domain_fieldset.html
@@ -2,6 +2,12 @@
 {% load static url_helpers %}
 
 
+{% block field_readonly %}
+    {% if field.field.name == "state" %}
+    <div class="readonly">{{ domain_state }}</div>
+    {% endif %}
+{% endblock %}
+
 {% block help_text %}
     <div class="help margin-bottom-1" {% if field.field.id_for_label %} id="{{ field.field.id_for_label }}_helptext"{% endif %}>
         {% if field.field.name == "state" %}