mirror of
https://github.com/cisagov/manage.get.gov.git
synced 2025-08-11 03:59:41 +02:00
linted
This commit is contained in:
parent
b124c1bb11
commit
bc2ffb3f70
1 changed files with 16 additions and 3 deletions
|
@ -2091,12 +2091,19 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
|
||||||
)
|
)
|
||||||
|
|
||||||
# Filter out empty values and return sorted unique entries
|
# 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):
|
def queryset(self, request, queryset):
|
||||||
if self.value():
|
if self.value():
|
||||||
return queryset.filter(
|
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
|
return queryset
|
||||||
|
|
||||||
|
@ -3307,7 +3314,13 @@ class DomainAdmin(ListHeaderAdmin, ImportExportModelAdmin):
|
||||||
)
|
)
|
||||||
|
|
||||||
# Filter out empty values and return sorted unique entries
|
# 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):
|
def queryset(self, request, queryset):
|
||||||
if self.value():
|
if self.value():
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue