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

Readd my user

Browse source
This commit is contained in:
zandercymatics 2024-02-22 09:03:35 -07:00
parent 92e8877cec
commit 1a088c4b35
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
2 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/registrar/admin.py
View file

@ -158,10 +158,8 @@ class AdminSortFields:
match db_field.name: match db_field.name:
case "investigator": case "investigator":
# We should only return users who are staff. # We should only return users who are staff.
# Currently a fallback. Consider removing this if it is not needed.
return model.objects.filter(is_staff=True).order_by(*order_by) return model.objects.filter(is_staff=True).order_by(*order_by)
case _: case _:
# If no case is defined, return the default
if isinstance(order_by, list) or isinstance(order_by, tuple): if isinstance(order_by, list) or isinstance(order_by, tuple):
return model.objects.order_by(*order_by) return model.objects.order_by(*order_by)
else: else:
@ -201,8 +199,8 @@ class AuditedAdmin(admin.ModelAdmin):
return formfield return formfield
def formfield_for_foreignkey(self, db_field, request, **kwargs): def formfield_for_foreignkey(self, db_field, request, **kwargs):
"""customize the behavior of formfields with foreign key relationships. this will customize """Customize the behavior of formfields with foreign key relationships. This will customize
the behavior of selects. customized behavior includes sorting of objects in list""" the behavior of selects. Customized behavior includes sorting of objects in list."""
# Define a queryset. Note that in the super of this, # Define a queryset. Note that in the super of this,
# a new queryset will only be generated if one does not exist. # a new queryset will only be generated if one does not exist.
@ -285,7 +283,7 @@ class UserContactInline(admin.StackedInline):
model = models.Contact model = models.Contact
class UserAdmin(BaseUserAdmin): class MyUserAdmin(BaseUserAdmin):
"""Custom user admin class to use our inlines.""" """Custom user admin class to use our inlines."""
class Meta: class Meta:
@ -1095,8 +1093,8 @@ class DomainInformationInline(admin.StackedInline):
return formfield return formfield
def formfield_for_foreignkey(self, db_field, request, **kwargs): def formfield_for_foreignkey(self, db_field, request, **kwargs):
"""customize the behavior of formfields with foreign key relationships. this will customize """Customize the behavior of formfields with foreign key relationships. This will customize
the behavior of selects. customized behavior includes sorting of objects in list""" the behavior of selects. Customized behavior includes sorting of objects in list."""
queryset = AdminSortFields.get_queryset(db_field) queryset = AdminSortFields.get_queryset(db_field)
if queryset: if queryset:
kwargs["queryset"] = queryset kwargs["queryset"] = queryset
@ -1406,7 +1404,7 @@ class VerifiedByStaffAdmin(ListHeaderAdmin):
admin.site.unregister(LogEntry) # Unregister the default registration admin.site.unregister(LogEntry) # Unregister the default registration
admin.site.register(LogEntry, CustomLogEntryAdmin) admin.site.register(LogEntry, CustomLogEntryAdmin)
admin.site.register(models.User, UserAdmin) admin.site.register(models.User, MyUserAdmin)
# Unregister the built-in Group model # Unregister the built-in Group model
admin.site.unregister(Group) admin.site.unregister(Group)
# Register UserGroup # Register UserGroup

10
src/registrar/tests/test_admin.py
View file

@ -9,7 +9,7 @@ from registrar.admin import (
DomainApplicationAdminForm, DomainApplicationAdminForm,
DomainInvitationAdmin, DomainInvitationAdmin,
ListHeaderAdmin, ListHeaderAdmin,
UserAdmin, MyUserAdmin,
AuditedAdmin, AuditedAdmin,
ContactAdmin, ContactAdmin,
DomainInformationAdmin, DomainInformationAdmin,
@ -949,7 +949,7 @@ class TestDomainApplicationAdmin(MockEppLib):
user_request = self.factory.post( user_request = self.factory.post(
"/admin/autocomplete/?app_label=registrar&model_name=domainapplication&field_name=investigator" "/admin/autocomplete/?app_label=registrar&model_name=domainapplication&field_name=investigator"
) )
user_admin = UserAdmin(User, self.site) user_admin = MyUserAdmin(User, self.site)
user_queryset = user_admin.get_search_results(user_request, application_queryset, None)[0] user_queryset = user_admin.get_search_results(user_request, application_queryset, None)[0]
current_dropdown = list(user_queryset) current_dropdown = list(user_queryset)
@ -1350,10 +1350,10 @@ class ListHeaderAdminTest(TestCase):
User.objects.all().delete() User.objects.all().delete()
class UserAdminTest(TestCase): class MyUserAdminTest(TestCase):
def setUp(self): def setUp(self):
admin_site = AdminSite() admin_site = AdminSite()
self.admin = UserAdmin(model=get_user_model(), admin_site=admin_site) self.admin = MyUserAdmin(model=get_user_model(), admin_site=admin_site)
def test_list_display_without_username(self): def test_list_display_without_username(self):
request = self.client.request().wsgi_request request = self.client.request().wsgi_request
@ -1375,7 +1375,7 @@ class UserAdminTest(TestCase):
request = self.client.request().wsgi_request request = self.client.request().wsgi_request
request.user = create_superuser() request.user = create_superuser()
fieldsets = self.admin.get_fieldsets(request) fieldsets = self.admin.get_fieldsets(request)
expected_fieldsets = super(UserAdmin, self.admin).get_fieldsets(request) expected_fieldsets = super(MyUserAdmin, self.admin).get_fieldsets(request)
self.assertEqual(fieldsets, expected_fieldsets) self.assertEqual(fieldsets, expected_fieldsets)
def test_get_fieldsets_cisa_analyst(self): def test_get_fieldsets_cisa_analyst(self):