This commit is contained in:
CocoByte 2025-01-28 10:47:24 -07:00
parent b124c1bb11
commit bc2ffb3f70
No known key found for this signature in database
GPG key ID: BBFAA2526384C97F

View file

@ -2091,12 +2091,19 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
)
# Filter out empty values and return sorted unique entries
return sorted([(federal_type, BranchChoices.get_branch_label(federal_type)) for federal_type in queryset if federal_type])
return sorted(
[
(federal_type, BranchChoices.get_branch_label(federal_type))
for federal_type in queryset
if federal_type
]
)
def queryset(self, request, queryset):
if self.value():
return queryset.filter(
Q(portfolio__federal_agency__federal_type=self.value()) | Q(portfolio__isnull=True, federal_type=self.value())
Q(portfolio__federal_agency__federal_type=self.value())
| Q(portfolio__isnull=True, federal_type=self.value())
)
return queryset
@ -3307,7 +3314,13 @@ class DomainAdmin(ListHeaderAdmin, ImportExportModelAdmin):
)
# Filter out empty values and return sorted unique entries
return sorted([(federal_type, BranchChoices.get_branch_label(federal_type)) for federal_type in queryset if federal_type])
return sorted(
[
(federal_type, BranchChoices.get_branch_label(federal_type))
for federal_type in queryset
if federal_type
]
)
def queryset(self, request, queryset):
if self.value():