This commit is contained in:
zandercymatics 2024-08-15 10:16:41 -06:00
parent cc1dd66553
commit 52e3fb89b7
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
3 changed files with 4 additions and 5 deletions

View file

@ -9,8 +9,6 @@ from django.db.models.functions import Concat, Coalesce
from django.http import HttpResponseRedirect from django.http import HttpResponseRedirect
from django.shortcuts import redirect from django.shortcuts import redirect
from django_fsm import get_available_FIELD_transitions, FSMField from django_fsm import get_available_FIELD_transitions, FSMField
from registrar.models.domain_group import DomainGroup
from registrar.models.suborganization import Suborganization
from registrar.models.utility.portfolio_helper import UserPortfolioPermissionChoices, UserPortfolioRoleChoices from registrar.models.utility.portfolio_helper import UserPortfolioPermissionChoices, UserPortfolioRoleChoices
from waffle.decorators import flag_is_active from waffle.decorators import flag_is_active
from django.contrib import admin, messages from django.contrib import admin, messages
@ -2932,7 +2930,7 @@ class PortfolioAdmin(ListHeaderAdmin):
def federal_type(self, obj: models.portfolio): def federal_type(self, obj: models.portfolio):
"""Returns the federal_type field""" """Returns the federal_type field"""
return BranchChoices.get_branch_label(obj.federal_type) if obj.federal_type else "-" return BranchChoices.get_branch_label(obj.federal_type) if obj.federal_type else "-"
federal_type.short_description = "Federal type" federal_type.short_description = "Federal type"
def created_on(self, obj: models.Portfolio): def created_on(self, obj: models.Portfolio):

View file

@ -137,7 +137,7 @@ class Portfolio(TimeStampedModel):
return " - ".join([org_type_label, agency_type_label]) return " - ".join([org_type_label, agency_type_label])
else: else:
return org_type_label return org_type_label
@property @property
def federal_type(self): def federal_type(self):
"""Returns the federal_type value on the underlying federal_agency field""" """Returns the federal_type value on the underlying federal_agency field"""

View file

@ -160,6 +160,7 @@ def and_filter(value, arg):
""" """
return bool(value and arg) return bool(value and arg)
@register.filter(name="has_contact_info") @register.filter(name="has_contact_info")
def has_contact_info(user): def has_contact_info(user):
"""Checks if the given object has the attributes: title, email, phone """Checks if the given object has the attributes: title, email, phone
@ -167,4 +168,4 @@ def has_contact_info(user):
if not hasattr(user, "title") or not hasattr(user, "email") or not hasattr(user, "phone"): if not hasattr(user, "title") or not hasattr(user, "email") or not hasattr(user, "phone"):
return False return False
else: else:
return bool(user.title or user.email or user.phone) return bool(user.title or user.email or user.phone)