diff --git a/src/registrar/admin.py b/src/registrar/admin.py index c58cd9702..5d90a90c5 100644 --- a/src/registrar/admin.py +++ b/src/registrar/admin.py @@ -2867,19 +2867,16 @@ class PortfolioAdmin(ListHeaderAdmin): ("Senior official", {"fields": ["senior_official"]}), ] - # NOTE: use add_fieldsets to modify that page list_display = ("organization_name", "federal_agency", "creator") search_fields = ["organization_name"] search_help_text = "Search by organization name." readonly_fields = [ "created_at", + "federal_type", # Custom fields such as these must be defined as readonly. - "administrators", - "members", "domains", "domain_requests", "suborganizations", - "federal_type", "portfolio_type", ] @@ -2951,7 +2948,14 @@ class PortfolioAdmin(ListHeaderAdmin): def change_view(self, request, object_id, form_url="", extra_context=None): """Add related suborganizations and domain groups""" obj = self.get_object(request, object_id) - extra_context = {"administrators": obj.get_administrators(), "members": obj.get_members()} + + # ---- Domain Groups + domain_groups = DomainGroup.objects.filter(portfolio=obj) + + # ---- Suborganizations + suborganizations = Suborganization.objects.filter(portfolio=obj) + + extra_context = {"domain_groups": domain_groups, "suborganizations": suborganizations} return super().change_view(request, object_id, form_url, extra_context) def save_model(self, request, obj, form, change): diff --git a/src/registrar/templates/django/admin/portfolio_change_form.html b/src/registrar/templates/django/admin/portfolio_change_form.html index 6b3b557a6..30f4fd31f 100644 --- a/src/registrar/templates/django/admin/portfolio_change_form.html +++ b/src/registrar/templates/django/admin/portfolio_change_form.html @@ -4,13 +4,7 @@ {% block field_sets %} {% for fieldset in adminform %} {% comment %} - TODO: this will eventually need to be changed to something like this - if we ever want to customize this file: - {% include "django/admin/includes/domain_information_fieldset.html" %} - - Use detail_table_fieldset as an example, or just extend it. - - original_object is just a variable name for "DomainInformation" or "DomainRequest" + This is a placeholder for now {% endcomment %} {% include "django/admin/includes/detail_table_fieldset.html" with original_object=original %} {% endfor %}