diff --git a/src/registrar/admin.py b/src/registrar/admin.py
index 30b49f17e..76c935f96 100644
--- a/src/registrar/admin.py
+++ b/src/registrar/admin.py
@@ -239,6 +239,14 @@ class DomainInformationInlineForm(forms.ModelForm):
fields = "__all__"
widgets = {
"other_contacts": NoAutocompleteFilteredSelectMultiple("other_contacts", False),
+ "portfolio": AutocompleteSelectWithPlaceholder(
+ DomainInformation._meta.get_field("portfolio"), admin.site, attrs={"data-placeholder": "---------"}
+ ),
+ "sub_organization": AutocompleteSelectWithPlaceholder(
+ DomainInformation._meta.get_field("sub_organization"),
+ admin.site,
+ attrs={"data-placeholder": "---------", "ajax-url": "get-suborganization-list-json"},
+ ),
}
@@ -2716,7 +2724,72 @@ class DomainInformationInline(admin.StackedInline):
template = "django/admin/includes/domain_info_inline_stacked.html"
model = models.DomainInformation
+ # Define methods to display fields from the related portfolio
+ def portfolio_senior_official(self, obj) -> Optional[SeniorOfficial]:
+ return obj.portfolio.senior_official if obj.portfolio and obj.portfolio.senior_official else None
+
+ portfolio_senior_official.short_description = "Senior official" # type: ignore
+
+ def portfolio_organization_type(self, obj):
+ return (
+ DomainRequest.OrganizationChoices.get_org_label(obj.portfolio.organization_type)
+ if obj.portfolio and obj.portfolio.organization_type
+ else "-"
+ )
+
+ portfolio_organization_type.short_description = "Organization type" # type: ignore
+
+ def portfolio_federal_type(self, obj):
+ return (
+ BranchChoices.get_branch_label(obj.portfolio.federal_type)
+ if obj.portfolio and obj.portfolio.federal_type
+ else "-"
+ )
+
+ portfolio_federal_type.short_description = "Federal type" # type: ignore
+
+ def portfolio_organization_name(self, obj):
+ return obj.portfolio.organization_name if obj.portfolio else ""
+
+ portfolio_organization_name.short_description = "Organization name" # type: ignore
+
+ def portfolio_federal_agency(self, obj):
+ return obj.portfolio.federal_agency if obj.portfolio else ""
+
+ portfolio_federal_agency.short_description = "Federal agency" # type: ignore
+
+ def portfolio_state_territory(self, obj):
+ return obj.portfolio.state_territory if obj.portfolio else ""
+
+ portfolio_state_territory.short_description = "State, territory, or military post" # type: ignore
+
+ def portfolio_address_line1(self, obj):
+ return obj.portfolio.address_line1 if obj.portfolio else ""
+
+ portfolio_address_line1.short_description = "Address line 1" # type: ignore
+
+ def portfolio_address_line2(self, obj):
+ return obj.portfolio.address_line2 if obj.portfolio else ""
+
+ portfolio_address_line2.short_description = "Address line 2" # type: ignore
+
+ def portfolio_city(self, obj):
+ return obj.portfolio.city if obj.portfolio else ""
+
+ portfolio_city.short_description = "City" # type: ignore
+
+ def portfolio_zipcode(self, obj):
+ return obj.portfolio.zipcode if obj.portfolio else ""
+
+ portfolio_zipcode.short_description = "Zip code" # type: ignore
+
+ def portfolio_urbanization(self, obj):
+ return obj.portfolio.urbanization if obj.portfolio else ""
+
+ portfolio_urbanization.short_description = "Urbanization" # type: ignore
+
fieldsets = copy.deepcopy(list(DomainInformationAdmin.fieldsets))
+ readonly_fields = copy.deepcopy(DomainInformationAdmin.readonly_fields)
analyst_readonly_fields = copy.deepcopy(DomainInformationAdmin.analyst_readonly_fields)
autocomplete_fields = copy.deepcopy(DomainInformationAdmin.autocomplete_fields)
diff --git a/src/registrar/assets/src/js/getgov-admin/domain-form.js b/src/registrar/assets/src/js/getgov-admin/domain-form.js
index 474e2822c..8c5ab5b1c 100644
--- a/src/registrar/assets/src/js/getgov-admin/domain-form.js
+++ b/src/registrar/assets/src/js/getgov-admin/domain-form.js
@@ -1,3 +1,5 @@
+import { handlePortfolioSelection } from './helpers-portfolio-dynamic-fields.js';
+
/**
* A function that appends target="_blank" to the domain_form buttons
*/
@@ -28,3 +30,15 @@ export function initDomainFormTargetBlankButtons() {
domainSubmitButton.addEventListener("mouseout", () => openInNewTab(domainFormElement, false));
}
}
+
+/**
+ * A function for dynamic Domain fields
+*/
+export function initDynamicDomainFields(){
+ const domainPage = document.getElementById("domain_form");
+ if (domainPage) {
+ console.log("handling domain page");
+ handlePortfolioSelection("#id_domain_info-0-portfolio",
+ "#id_domain_info-0-sub_organization");
+ }
+}
diff --git a/src/registrar/assets/src/js/getgov-admin/domain-information-form.js b/src/registrar/assets/src/js/getgov-admin/domain-information-form.js
index 072b73720..6c79bd32a 100644
--- a/src/registrar/assets/src/js/getgov-admin/domain-information-form.js
+++ b/src/registrar/assets/src/js/getgov-admin/domain-information-form.js
@@ -1,11 +1,12 @@
import { handlePortfolioSelection } from './helpers-portfolio-dynamic-fields.js';
/**
- * A function for dynamic DomainRequest fields
+ * A function for dynamic DomainInformation fields
*/
export function initDynamicDomainInformationFields(){
const domainInformationPage = document.getElementById("domaininformation_form");
if (domainInformationPage) {
+ console.log("handling domain information page");
handlePortfolioSelection();
}
}
diff --git a/src/registrar/assets/src/js/getgov-admin/helpers-portfolio-dynamic-fields.js b/src/registrar/assets/src/js/getgov-admin/helpers-portfolio-dynamic-fields.js
index ca4c4b44c..64813df86 100644
--- a/src/registrar/assets/src/js/getgov-admin/helpers-portfolio-dynamic-fields.js
+++ b/src/registrar/assets/src/js/getgov-admin/helpers-portfolio-dynamic-fields.js
@@ -48,10 +48,13 @@ export function handleSuborganizationFields(
*
* IMPORTANT NOTE: The logic in this method is paired dynamicPortfolioFields
*/
-export function handlePortfolioSelection() {
+export function handlePortfolioSelection(
+ portfolioDropdownSelector="#id_portfolio",
+ suborgDropdownSelector="#id_sub_organization"
+) {
// These dropdown are select2 fields so they must be interacted with via jquery
- const portfolioDropdown = django.jQuery("#id_portfolio");
- const suborganizationDropdown = django.jQuery("#id_sub_organization");
+ const portfolioDropdown = django.jQuery(portfolioDropdownSelector);
+ const suborganizationDropdown = django.jQuery(suborgDropdownSelector);
const suborganizationField = document.querySelector(".field-sub_organization");
const requestedSuborganizationField = document.querySelector(".field-requested_suborganization");
const suborganizationCity = document.querySelector(".field-suborganization_city");
@@ -440,8 +443,8 @@ export function handlePortfolioSelection() {
showElement(portfolioSeniorOfficialField);
// Hide fields not applicable when a portfolio is selected
- hideElement(otherEmployeesField);
- hideElement(noOtherContactsRationaleField);
+ if (otherEmployeesField) hideElement(otherEmployeesField);
+ if (noOtherContactsRationaleField) hideElement(noOtherContactsRationaleField);
hideElement(cisaRepresentativeFirstNameField);
hideElement(cisaRepresentativeLastNameField);
hideElement(cisaRepresentativeEmailField);
@@ -463,8 +466,8 @@ export function handlePortfolioSelection() {
// Show fields that are relevant when no portfolio is selected
showElement(seniorOfficialField);
hideElement(portfolioSeniorOfficialField);
- showElement(otherEmployeesField);
- showElement(noOtherContactsRationaleField);
+ if (otherEmployeesField) showElement(otherEmployeesField);
+ if (noOtherContactsRationaleField) showElement(noOtherContactsRationaleField);
showElement(cisaRepresentativeFirstNameField);
showElement(cisaRepresentativeLastNameField);
showElement(cisaRepresentativeEmailField);
diff --git a/src/registrar/assets/src/js/getgov-admin/main.js b/src/registrar/assets/src/js/getgov-admin/main.js
index ec9aeeedf..64be572b2 100644
--- a/src/registrar/assets/src/js/getgov-admin/main.js
+++ b/src/registrar/assets/src/js/getgov-admin/main.js
@@ -14,6 +14,7 @@ import {
import { initDomainFormTargetBlankButtons } from './domain-form.js';
import { initDynamicPortfolioFields } from './portfolio-form.js';
import { initDynamicDomainInformationFields } from './domain-information-form.js';
+import { initDynamicDomainFields } from './domain-form.js';
// General
initModals();
@@ -33,6 +34,7 @@ initDynamicDomainRequestFields();
// Domain
initDomainFormTargetBlankButtons();
+initDynamicDomainFields();
// Portfolio
initDynamicPortfolioFields();
diff --git a/src/registrar/templates/django/admin/domain_change_form.html b/src/registrar/templates/django/admin/domain_change_form.html
index 662328660..7aa0034b9 100644
--- a/src/registrar/templates/django/admin/domain_change_form.html
+++ b/src/registrar/templates/django/admin/domain_change_form.html
@@ -1,6 +1,13 @@
{% extends 'admin/change_form.html' %}
{% load i18n static %}
+{% block content %}
+ {% comment %} Stores the json endpoint in a url for easier access {% endcomment %}
+ {% url 'get-portfolio-json' as url %}
+
+ {{ block.super }}
+{% endblock content %}
+
{% block field_sets %}