Remove old code

This commit is contained in:
zandercymatics 2023-12-14 09:15:59 -07:00
parent 6de09d5bb8
commit 3d4972773c
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
2 changed files with 30 additions and 7 deletions

View file

@ -555,13 +555,10 @@ class DomainApplicationAdmin(ListHeaderAdmin):
parameter_name = "investigator" parameter_name = "investigator"
def lookups(self, request, model_admin): def lookups(self, request, model_admin):
"""Lookup reimplementation, gets users by the MANAGER role. """Lookup reimplementation, gets users of is_staff.
Returns a list of tuples consisting of (user.id, user) Returns a list of tuples consisting of (user.id, user)
""" """
valid_user_ids = UserDomainRole.objects.filter(role=UserDomainRole.Roles.MANAGER).values_list( privileged_users = User.objects.filter(is_staff=True)
"user__id", flat=True
)
privileged_users = User.objects.filter(id__in=valid_user_ids)
return [(user.id, user) for user in privileged_users] return [(user.id, user) for user in privileged_users]
def queryset(self, request, queryset): def queryset(self, request, queryset):
@ -663,6 +660,7 @@ class DomainApplicationAdmin(ListHeaderAdmin):
return super().formfield_for_manytomany(db_field, request, **kwargs) return super().formfield_for_manytomany(db_field, request, **kwargs)
def get_queryset(self, request): def get_queryset(self, request):
"""Queryset reimplementation to order the table alphabetically"""
query_set = super().get_queryset(request) query_set = super().get_queryset(request)
return query_set.order_by("requested_domain__name") return query_set.order_by("requested_domain__name")

View file

@ -848,6 +848,7 @@ class TestDomainApplicationAdmin(MockEppLib):
request = self.factory.get("/") request = self.factory.get("/")
request.user = self.superuser request.user = self.superuser
# Grab the current list of table filters
readonly_fields = self.admin.get_list_filter(request) readonly_fields = self.admin.get_list_filter(request)
expected_fields = ("status", "organization_type", DomainApplicationAdmin.InvestigatorFilter) expected_fields = ("status", "organization_type", DomainApplicationAdmin.InvestigatorFilter)
@ -859,13 +860,37 @@ class TestDomainApplicationAdmin(MockEppLib):
self.client.login(username="staffuser", password=p) self.client.login(username="staffuser", password=p)
response = self.client.get( response = self.client.get(
"/admin/registrar/domainapplication/", "/admin/registrar/domainapplication/",
{},
follow=True,
) )
# Create a mock DomainApplication object, with a fake investigator
application: DomainApplication = generic_domain_object("application", "SomeGuy")
# Add the role manager to the investigator
UserDomainRole.objects.get_or_create(
user=application.investigator,
role=UserDomainRole.Roles.MANAGER,
domain=Domain.objects.create(name="SomeGuy.gov")
)
# First, make sure that there is still an investigator field to begin with
expected_sort_column = "sortable column-investigator" expected_sort_column = "sortable column-investigator"
self.assertContains(response, expected_sort_column, count=1) self.assertContains(response, expected_sort_column, count=1)
# Then, test if the filter actually exists
self.assertIn("filters", response.context)
# Assert the content of filters and search_query
filters = response.context["filters"]
self.assertEqual(
filters,
[
{"parameter_name": "status", "parameter_value": "started"},
{
"parameter_name": "investigator",
"parameter_value": "test",
},
],
)
def test_investigator_filter(self): def test_investigator_filter(self):
"""Tests the custom investigator filter""" """Tests the custom investigator filter"""
# Creates multiple domain applications # Creates multiple domain applications