diff --git a/src/registrar/admin.py b/src/registrar/admin.py index 784da0564..5108cfd8e 100644 --- a/src/registrar/admin.py +++ b/src/registrar/admin.py @@ -103,9 +103,9 @@ class MyUserAdmin(BaseUserAdmin): if not request.user.is_superuser: # Customize the list display for staff users return ("email", "first_name", "last_name", "is_staff", "is_superuser") - else: - # Use the default list display for non-staff users - return super().get_list_display(request) + + # Use the default list display for non-staff users + return super().get_list_display(request) def get_fieldsets(self, request, obj=None): if not request.user.is_superuser: diff --git a/src/registrar/tests/common.py b/src/registrar/tests/common.py index a613ba648..4359fc454 100644 --- a/src/registrar/tests/common.py +++ b/src/registrar/tests/common.py @@ -99,7 +99,7 @@ def mock_user(): return mock_user -def create_superuser(self): +def create_superuser(): User = get_user_model() p = "adminpass" return User.objects.create_superuser( @@ -109,7 +109,7 @@ def create_superuser(self): ) -def create_user(self): +def create_user(): User = get_user_model() p = "userpass" return User.objects.create_user( diff --git a/src/registrar/tests/test_admin.py b/src/registrar/tests/test_admin.py index cd499e306..db875324e 100644 --- a/src/registrar/tests/test_admin.py +++ b/src/registrar/tests/test_admin.py @@ -175,7 +175,7 @@ class ListHeaderAdminTest(TestCase): self.factory = RequestFactory() self.admin = ListHeaderAdmin(model=DomainApplication, admin_site=None) self.client = Client(HTTP_HOST="localhost:8080") - self.superuser = create_superuser(self) + self.superuser = create_superuser() def test_changelist_view(self): # Have to get creative to get past linter @@ -249,7 +249,7 @@ class MyUserAdminTest(TestCase): def test_list_display_without_username(self): request = self.client.request().wsgi_request - request.user = create_user(self) + request.user = create_user() list_display = self.admin.get_list_display(request) expected_list_display = ( @@ -265,14 +265,14 @@ class MyUserAdminTest(TestCase): def test_get_fieldsets_superuser(self): request = self.client.request().wsgi_request - request.user = create_superuser(self) + request.user = create_superuser() fieldsets = self.admin.get_fieldsets(request) expected_fieldsets = super(MyUserAdmin, self.admin).get_fieldsets(request) self.assertEqual(fieldsets, expected_fieldsets) def test_get_fieldsets_non_superuser(self): request = self.client.request().wsgi_request - request.user = create_user(self) + request.user = create_user() fieldsets = self.admin.get_fieldsets(request) expected_fieldsets = ((None, {"fields": []}),) self.assertEqual(fieldsets, expected_fieldsets)