diff --git a/src/registrar/admin.py b/src/registrar/admin.py index d9b9509e1..020dc2540 100644 --- a/src/registrar/admin.py +++ b/src/registrar/admin.py @@ -4329,9 +4329,11 @@ class DomainAdmin(ListHeaderAdmin, ImportExportRegistrarModelAdmin): # Fixes a bug wherein users which are only is_staff # can access 'change' when GET, # but cannot access this page when it is a request of type POST. - if request.user.has_perm("registrar.full_access_permission") or request.user.has_perm( - "registrar.analyst_access_permission" - ) or request.user.has_perm("registrar.omb_analyst_access_permission"): + if ( + request.user.has_perm("registrar.full_access_permission") + or request.user.has_perm("registrar.analyst_access_permission") + or request.user.has_perm("registrar.omb_analyst_access_permission") + ): return True return super().has_change_permission(request, obj) diff --git a/src/registrar/templates/django/admin/domain_change_form.html b/src/registrar/templates/django/admin/domain_change_form.html index 9f34feae6..2e6f57237 100644 --- a/src/registrar/templates/django/admin/domain_change_form.html +++ b/src/registrar/templates/django/admin/domain_change_form.html @@ -33,8 +33,10 @@ {% endif %} {% if original.state == original.State.READY or original.state == original.State.ON_HOLD %} + {% if not adminform.form.is_omb_analyst %} | {% endif %} + {% endif %} {% if original.state != original.State.DELETED and not adminform.form.is_omb_analyst %} Remove from registry