Merge branch 'ms/3212-FEB-review' into ms/3457-FEB-emails

This commit is contained in:
matthewswspence 2025-03-18 15:03:07 -05:00
commit b350a50876
No known key found for this signature in database
GPG key ID: FB458202A7852BA4
39 changed files with 2116 additions and 487 deletions

View file

@ -1530,7 +1530,9 @@ class DomainRequest(TimeStampedModel):
def converted_federal_type(self):
if self.portfolio:
return self.portfolio.federal_type
return self.federal_type
elif self.federal_agency:
return self.federal_agency.federal_type
return None
@property
def converted_address_line1(self):