zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-08-26 11:03:49 +02:00
Code Issues Projects Releases Packages Wiki Activity

Remove portfolio type field

Browse source 
Move portfolio org, rename to organization name, move sections, hide organization name if federal
This commit is contained in:
zandercymatics 2024-09-25 08:52:52 -06:00
parent 45479e86c7
commit ab35657147
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
7 changed files with 58 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/registrar/models/portfolio.py
View file

@ -34,7 +34,6 @@ class Portfolio(TimeStampedModel):
organization_name = models.CharField(
null=True,
blank=True,
verbose_name="Portfolio organization",
)
organization_type = models.CharField(
@ -58,14 +57,6 @@ class Portfolio(TimeStampedModel):
default=FederalAgency.get_non_federal_agency,
)
federal_type = models.CharField(
max_length=20,
choices=BranchChoices.choices,
null=True,
blank=True,
help_text="Federal agency type (executive, judicial, legislative, etc.)",
)
senior_official = models.ForeignKey(
"registrar.SeniorOfficial",
on_delete=models.PROTECT,
@ -131,28 +122,16 @@ class Portfolio(TimeStampedModel):
if self.state_territory != self.StateTerritoryChoices.PUERTO_RICO and self.urbanization:
self.urbanization = None
# Set the federal type field if it doesn't exist already
if self.federal_type is None and self.federal_agency and self.federal_agency.federal_type:
self.federal_type = self.federal_agency.federal_type if self.federal_agency else None
super().save(*args, **kwargs)
@property
def portfolio_type(self):
"""
Returns a combination of organization_type / federal_type, seperated by ' - '.
If no federal_type is found, we just return the org type.
"""
return self.get_portfolio_type(self.organization_type, self.federal_type)
def federal_type(self):
"""Returns the federal_type value on the underlying federal_agency field"""
return self.get_federal_type(self.federal_agency)
@classmethod
def get_portfolio_type(cls, organization_type, federal_type):
org_type_label = cls.OrganizationChoices.get_org_label(organization_type)
agency_type_label = BranchChoices.get_branch_label(federal_type)
if organization_type == cls.OrganizationChoices.FEDERAL and agency_type_label:
return " - ".join([org_type_label, agency_type_label])
else:
return org_type_label
def get_federal_type(cls, federal_agency):
return federal_agency.federal_type if federal_agency else None
# == Getters for domains == #
def get_domains(self):