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

Requested changes

Browse source
This commit is contained in:
zandercymatics 2025-02-04 09:58:17 -07:00
parent d14a23621e
commit 367b2b8043
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/registrar/forms/domain_request_wizard.py
View file

@ -322,7 +322,7 @@ class OrganizationContactForm(RegistrarForm):
# if it has been filled in when required. # if it has been filled in when required.
# uncomment to see if modelChoiceField can be an arg later # uncomment to see if modelChoiceField can be an arg later
required=False, required=False,
# We populate this queryset in init. We want to exclude agencies with a portfolio. # We populate this queryset in init.
queryset=FederalAgency.objects.none(), queryset=FederalAgency.objects.none(),
widget=ComboboxWidget, widget=ComboboxWidget,
) )
@ -369,12 +369,12 @@ class OrganizationContactForm(RegistrarForm):
super().__init__(*args, **kwargs) super().__init__(*args, **kwargs)
# Set the queryset for federal agency. # Set the queryset for federal agency.
# If the organization_requests flag is active, we hide data that exists in portfolios. # If the organization_requests flag is active, We want to exclude agencies with a portfolio.
federal_agency_queryset = FederalAgency.objects.exclude(agency__in=self.excluded_agencies) federal_agency_queryset = FederalAgency.objects.exclude(agency__in=self.excluded_agencies)
if flag_is_active_anywhere("organization_feature") and flag_is_active_anywhere("organization_requests"): if flag_is_active_anywhere("organization_feature") and flag_is_active_anywhere("organization_requests"):
# Exclude both predefined agencies and those matching portfolio names in one query # Exclude both predefined agencies and those matching portfolio records in one query
federal_agency_queryset = federal_agency_queryset.exclude( federal_agency_queryset = federal_agency_queryset.exclude(
agency__in=Portfolio.objects.values_list("organization_name", flat=True) id__in=Portfolio.objects.values_list("federal_agency__id", flat=True)
) )
self.fields["federal_agency"].queryset = federal_agency_queryset self.fields["federal_agency"].queryset = federal_agency_queryset

4
src/registrar/models/domain_request.py
View file

@ -1306,9 +1306,9 @@ class DomainRequest(TimeStampedModel):
Portfolio = apps.get_model("registrar.Portfolio") Portfolio = apps.get_model("registrar.Portfolio")
return ( return (
FederalAgency.objects.exclude( FederalAgency.objects.exclude(
agency__in=Portfolio.objects.values_list("organization_name", flat=True), id__in=Portfolio.objects.values_list("federal_agency__id", flat=True),
) )
.filter(agency=self.federal_agency) .filter(id=self.federal_agency.id)
.exists() .exists()
) )
return bool( return bool(