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

linted

Browse source
This commit is contained in:
CocoByte 2024-12-18 23:20:53 -07:00
parent f2201c4c6e
commit fa6b4b74b8
No known key found for this signature in database
GPG key ID: BBFAA2526384C97F
1 changed files with 9 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/registrar/admin.py
View file

@ -1829,7 +1829,7 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
form = DomainRequestAdminForm form = DomainRequestAdminForm
change_form_template = "django/admin/domain_request_change_form.html" change_form_template = "django/admin/domain_request_change_form.html"
# ------ Filters ------ # ------ Filters ------
# Define custom filters # Define custom filters
class StatusListFilter(MultipleChoiceListFilter): class StatusListFilter(MultipleChoiceListFilter):
@ -1966,7 +1966,7 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
return queryset.filter(is_election_board=True) return queryset.filter(is_election_board=True)
if self.value() == "0": if self.value() == "0":
return queryset.filter(Q(is_election_board=False) | Q(is_election_board=None)) return queryset.filter(Q(is_election_board=False) | Q(is_election_board=None))
class PortfolioFilter(admin.SimpleListFilter): class PortfolioFilter(admin.SimpleListFilter):
"""Define a custom filter for portfolio""" """Define a custom filter for portfolio"""
@ -1978,7 +1978,7 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
("1", _("Yes")), ("1", _("Yes")),
("0", _("No")), ("0", _("No")),
) )
def queryset(self, request, queryset): def queryset(self, request, queryset):
if self.value() == "1": if self.value() == "1":
return queryset.filter(Q(portfolio__isnull=False)) return queryset.filter(Q(portfolio__isnull=False))
@ -1992,24 +1992,15 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
custom_election_board.admin_order_field = "is_election_board" # type: ignore custom_election_board.admin_order_field = "is_election_board" # type: ignore
custom_election_board.short_description = "Election office" # type: ignore custom_election_board.short_description = "Election office" # type: ignore
@admin.display(description=_("Requested Domain")) @admin.display(description=_("Requested Domain"))
def custom_requested_domain(self, obj): def custom_requested_domain(self, obj):
# Example: Show different icons based on `status` # Example: Show different icons based on `status`
url = reverse("admin:registrar_domainrequest_changelist") + f"{obj.id}" url = reverse("admin:registrar_domainrequest_changelist") + f"{obj.id}"
text = obj.requested_domain text = obj.requested_domain
icon = ''
if obj.portfolio: if obj.portfolio:
return format_html( return format_html('<a href="{}"><img src="/public/admin/img/icon-yes.svg"> {}</a>', url, text)
'<a href="{}"><img src="/public/admin/img/icon-yes.svg"> {}</a>', return format_html('<a href="{}">{}</a>', url, text)
url,
text
)
return format_html(
'<a href="{}">{}</a>',
url,
text
)
custom_requested_domain.admin_order_field = "requested_domain__name" # type: ignore custom_requested_domain.admin_order_field = "requested_domain__name" # type: ignore
# ------ Converted fields ------ # ------ Converted fields ------
@ -2025,11 +2016,7 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
if obj.portfolio: if obj.portfolio:
url = reverse("admin:registrar_portfolio_changelist") + f"{obj.portfolio.id}" url = reverse("admin:registrar_portfolio_changelist") + f"{obj.portfolio.id}"
text = obj.converted_organization_name text = obj.converted_organization_name
return format_html( return format_html('<a href="{}">{}</a>', url, text)
'<a href="{}">{}</a>',
url,
text
)
else: else:
return obj.converted_organization_name return obj.converted_organization_name
@ -2049,7 +2036,6 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
def converted_state_territory(self, obj): def converted_state_territory(self, obj):
return obj.converted_state_territory return obj.converted_state_territory
# ------ Portfolio fields ------ # ------ Portfolio fields ------
# Define methods to display fields from the related portfolio # Define methods to display fields from the related portfolio
def portfolio_senior_official(self, obj) -> Optional[SeniorOfficial]: def portfolio_senior_official(self, obj) -> Optional[SeniorOfficial]:
@ -2746,7 +2732,7 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
# Further filter the queryset by the portfolio # Further filter the queryset by the portfolio
qs = qs.filter(portfolio=portfolio_id) qs = qs.filter(portfolio=portfolio_id)
return qs return qs
def get_search_results(self, request, queryset, search_term): def get_search_results(self, request, queryset, search_term):
# Call the parent's method to apply default search logic # Call the parent's method to apply default search logic
base_queryset, use_distinct = super().get_search_results(request, queryset, search_term) base_queryset, use_distinct = super().get_search_results(request, queryset, search_term)
@ -3822,8 +3808,7 @@ class PortfolioAdmin(ListHeaderAdmin):
# Even though this is empty, I will leave it as a stub for easy changes in the future # Even though this is empty, I will leave it as a stub for easy changes in the future
# rather than strip it out of our logic. # rather than strip it out of our logic.
analyst_readonly_fields = [ analyst_readonly_fields = [] # type: ignore
]
def get_admin_users(self, obj): def get_admin_users(self, obj):
# Filter UserPortfolioPermission objects related to the portfolio # Filter UserPortfolioPermission objects related to the portfolio