zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-07-27 04:58:42 +02:00
Code Issues Projects Releases Packages Wiki Activity

PR feedback

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

6
src/registrar/admin.py
View file

@ -2091,12 +2091,12 @@ 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, 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): def queryset(self, request, queryset):
if self.value(): if self.value():
return queryset.filter( 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 return queryset
@ -3307,7 +3307,7 @@ 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, 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): def queryset(self, request, queryset):
if self.value(): if self.value():

2
src/registrar/fixtures/fixtures_requests.py
View file

@ -325,7 +325,7 @@ class DomainRequestFixture:
@classmethod @classmethod
def _create_domain_requests(cls, users): # noqa: C901 def _create_domain_requests(cls, users): # noqa: C901
"""Creates DomainRequests given a list of users.""" """Creates DomainRequests given a list of users."""
total_domain_requests_to_make = users.count() # 100000 total_domain_requests_to_make = len(users) # 100000
# Check if the database is already populated with the desired # Check if the database is already populated with the desired
# number of entries. # number of entries.