zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-07-29 22:16:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

Cleanup and unit test fixes

Browse source
This commit is contained in:
CocoByte 2024-12-04 19:43:39 -07:00
parent 3b9e9e39eb
commit 87a9655828
No known key found for this signature in database
GPG key ID: BBFAA2526384C97F
5 changed files with 87 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/registrar/admin.py
View file

@ -1760,10 +1760,6 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
Q(portfolio__federal_agency__federal_type=self.value()) |
Q(portfolio__isnull=True, federal_type=self.value())
)
# return queryset.filter(
# Q(portfolio__federal_type=self.value()) |
# Q(portfolio__isnull=True, federal_type=self.value())
# )
return queryset
class InvestigatorFilter(admin.SimpleListFilter):
@ -2778,8 +2774,6 @@ class DomainAdmin(ListHeaderAdmin, ImportExportModelAdmin):
# Filter queryset
def queryset(self, request, queryset):
if self.value(): # Check if a generic org is selected in the filter
# return queryset.filter(converted_generic_org_type = self.value)
return queryset.filter(
Q(domain_info__portfolio__organization_type=self.value()) |
Q(domain_info__portfolio__isnull=True, domain_info__generic_org_type=self.value())