PR feedback

This commit is contained in:
CocoByte 2025-01-27 15:34:36 -07:00
parent ba2e82c150
commit cd0fbe4cda
No known key found for this signature in database
GPG key ID: BBFAA2526384C97F
2 changed files with 4 additions and 4 deletions

View file

@ -2091,12 +2091,12 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
)
# Filter out empty values and return sorted unique entries
return sorted([(federal_type, federal_type) for federal_type in queryset if federal_type])
return sorted([(federal_type, DomainRequest.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_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 +3307,7 @@ class DomainAdmin(ListHeaderAdmin, ImportExportModelAdmin):
)
# Filter out empty values and return sorted unique entries
return sorted([(federal_type, federal_type) for federal_type in queryset if federal_type])
return sorted([(federal_type, DomainRequest.BranchChoices.get_branch_label(federal_type)) for federal_type in queryset if federal_type])
def queryset(self, request, queryset):
if self.value():