diff --git a/src/registrar/admin.py b/src/registrar/admin.py index 22d03d998..ffe077a76 100644 --- a/src/registrar/admin.py +++ b/src/registrar/admin.py @@ -2121,7 +2121,7 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin): we'll use the baseline readonly_fields and extend it as needed. """ readonly_fields = list(self.readonly_fields) - + # Check if the creator is restricted if obj and obj.creator.status == models.User.RESTRICTED: # For fields like CharField, IntegerField, etc., the widget used is diff --git a/src/registrar/models/domain_request.py b/src/registrar/models/domain_request.py index 41c97fce7..0d8bbd5cf 100644 --- a/src/registrar/models/domain_request.py +++ b/src/registrar/models/domain_request.py @@ -1448,3 +1448,9 @@ class DomainRequest(TimeStampedModel): if self.portfolio: return self.portfolio.state_territory return self.state_territory + + @property + def converted_senior_official(self): + if self.portfolio: + return self.portfolio.senior_official + return self.senior_official diff --git a/src/registrar/utility/csv_export.py b/src/registrar/utility/csv_export.py index d85d38d8e..9141556af 100644 --- a/src/registrar/utility/csv_export.py +++ b/src/registrar/utility/csv_export.py @@ -661,10 +661,10 @@ class DomainRequestsDataType: cls.safe_get(getattr(request, "all_other_contacts", None)), cls.safe_get(getattr(request, "all_current_websites", None)), cls.safe_get(getattr(request, "converted_federal_agency", None)), - cls.safe_get(getattr(request.senior_official, "first_name", None)), - cls.safe_get(getattr(request.senior_official, "last_name", None)), - cls.safe_get(getattr(request.senior_official, "email", None)), - cls.safe_get(getattr(request.senior_official, "title", None)), + cls.safe_get(getattr(request.converted_senior_official, "first_name", None)), + cls.safe_get(getattr(request.converted_senior_official, "last_name", None)), + cls.safe_get(getattr(request.converted_senior_official, "email", None)), + cls.safe_get(getattr(request.converted_senior_official, "title", None)), cls.safe_get(getattr(request.creator, "first_name", None)), cls.safe_get(getattr(request.creator, "last_name", None)), cls.safe_get(getattr(request.creator, "email", None)), @@ -1265,11 +1265,11 @@ class DomainRequestExport(BaseExport): """ # Handle the federal_type field. Defaults to the wrong format. - federal_type = model.get("federal_type") + federal_type = model.converted_federal_type human_readable_federal_type = BranchChoices.get_branch_label(federal_type) if federal_type else None # Handle the org_type field - org_type = model.get("generic_org_type") or model.get("organization_type") + org_type = model.converted_generic_org_type human_readable_org_type = DomainRequest.OrganizationChoices.get_org_label(org_type) if org_type else None # Handle the status field. Defaults to the wrong format. @@ -1277,7 +1277,7 @@ class DomainRequestExport(BaseExport): status_display = DomainRequest.DomainRequestStatus.get_status_label(status) if status else None # Handle the region field. - state_territory = model.get("state_territory") + state_territory = model.converted_state_territory region = get_region(state_territory) if state_territory else None # Handle the requested_domain field (add a default if None)