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

cleaned up unnecessary code

Browse source
This commit is contained in:
David Kennedy 2025-03-18 07:45:42 -04:00
parent 192a7bb8a4
commit 5528390ee9
No known key found for this signature in database
GPG key ID: 6528A5386E66B96B
1 changed files with 5 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

47
src/registrar/admin.py
View file

@ -4836,19 +4836,6 @@ class PortfolioAdmin(ListHeaderAdmin):
readonly_fields.extend([field for field in self.analyst_readonly_fields]) readonly_fields.extend([field for field in self.analyst_readonly_fields])
return readonly_fields return readonly_fields
def get_annotated_queryset(self, queryset):
return queryset.annotate(
converted_federal_type=Case(
# When portfolio is present, use its value instead
When(
Q(federal_agency__isnull=False),
then=F("federal_agency__federal_type"),
),
# Otherwise, return empty string
default=Value(""),
),
)
def get_queryset(self, request): def get_queryset(self, request):
"""Restrict queryset based on user permissions.""" """Restrict queryset based on user permissions."""
qs = super().get_queryset(request) qs = super().get_queryset(request)
@ -4856,11 +4843,7 @@ class PortfolioAdmin(ListHeaderAdmin):
# Check if user is in OMB analysts group # Check if user is in OMB analysts group
if request.user.groups.filter(name="omb_analysts_group").exists(): if request.user.groups.filter(name="omb_analysts_group").exists():
self.is_omb_analyst = True self.is_omb_analyst = True
annotated_qs = self.get_annotated_queryset(qs) return qs.filter(federal_agency__federal_type=BranchChoices.EXECUTIVE)
return annotated_qs.filter(
organization_type=DomainRequest.OrganizationChoices.FEDERAL,
converted_federal_type=BranchChoices.EXECUTIVE,
)
return qs # Return full queryset if the user doesn't have the restriction return qs # Return full queryset if the user doesn't have the restriction
@ -5110,34 +5093,14 @@ class SuborganizationAdmin(ListHeaderAdmin, ImportExportRegistrarModelAdmin):
extra_context = {"domain_requests": domain_requests, "domains": domains} extra_context = {"domain_requests": domain_requests, "domains": domains}
return super().change_view(request, object_id, form_url, extra_context) return super().change_view(request, object_id, form_url, extra_context)
def get_annotated_queryset(self, queryset):
return queryset.annotate(
converted_federal_type=Case(
# When portfolio is present, use its value instead
When(
Q(portfolio__isnull=False) & Q(portfolio__federal_agency__isnull=False),
then=F("portfolio__federal_agency__federal_type"),
),
# Otherwise, return empty string
default=Value(""),
),
)
def get_queryset(self, request): def get_queryset(self, request):
"""Custom get_queryset to filter by portfolio if portfolio is in the """Custom get_queryset to filter for OMB analysts."""
request params."""
qs = super().get_queryset(request) qs = super().get_queryset(request)
# Check if a 'portfolio' parameter is passed in the request
portfolio_id = request.GET.get("portfolio")
if portfolio_id:
# Further filter the queryset by the portfolio
qs = qs.filter(portfolio=portfolio_id)
# Check if user is in OMB analysts group # Check if user is in OMB analysts group
if request.user.groups.filter(name="omb_analysts_group").exists(): if request.user.groups.filter(name="omb_analysts_group").exists():
annotated_qs = self.get_annotated_queryset(qs) return qs.filter(
return annotated_qs.filter(
portfolio__organization_type=DomainRequest.OrganizationChoices.FEDERAL, portfolio__organization_type=DomainRequest.OrganizationChoices.FEDERAL,
converted_federal_type=BranchChoices.EXECUTIVE, portfolio__federal_agency__federal_type=BranchChoices.EXECUTIVE,
) )
return qs return qs
@ -5147,7 +5110,7 @@ class SuborganizationAdmin(ListHeaderAdmin, ImportExportRegistrarModelAdmin):
return True return True
if obj: if obj:
if request.user.groups.filter(name="omb_analysts_group").exists(): if request.user.groups.filter(name="omb_analysts_group").exists():
return obj.portfolio and obj.portfolio.federal_type == BranchChoices.EXECUTIVE return obj.portfolio and obj.portfolio.federal_agency and obj.portfolio.federal_agency.federal_type == BranchChoices.EXECUTIVE
return super().has_view_permission(request, obj) return super().has_view_permission(request, obj)