diff --git a/src/registrar/admin.py b/src/registrar/admin.py
index 904701be7..338311f67 100644
--- a/src/registrar/admin.py
+++ b/src/registrar/admin.py
@@ -3227,28 +3227,6 @@ class PortfolioAdmin(ListHeaderAdmin):
return self.add_fieldsets
return super().get_fieldsets(request, obj)
- def get_readonly_fields(self, request, obj=None):
- """Set the read-only state on form elements.
- We have 2 conditions that determine which fields are read-only:
- admin user permissions and the creator's status, so
- we'll use the baseline readonly_fields and extend it as needed.
- """
- readonly_fields = list(self.readonly_fields)
-
- # Check if the creator is restricted
- if obj and obj.creator.status == models.User.RESTRICTED:
- # For fields like CharField, IntegerField, etc., the widget used is
- # straightforward and the readonly_fields list can control their behavior
- readonly_fields.extend([field.name for field in self.model._meta.fields])
-
- if request.user.has_perm("registrar.full_access_permission"):
- return readonly_fields
-
- # Return restrictive Read-only fields for analysts and
- # users who might not belong to groups
- readonly_fields.extend([field for field in self.analyst_readonly_fields])
- return readonly_fields
-
def change_view(self, request, object_id, form_url="", extra_context=None):
"""Add related suborganizations and domain groups.
Add the summary for the portfolio members field (list of members that link to change_forms)."""
diff --git a/src/registrar/tests/test_admin.py b/src/registrar/tests/test_admin.py
index 88482e4db..fd55e83f1 100644
--- a/src/registrar/tests/test_admin.py
+++ b/src/registrar/tests/test_admin.py
@@ -2051,7 +2051,7 @@ class TestPortfolioAdmin(TestCase):
email="meaoward@gov.gov",
)
- UserPortfolioPermission.objects.all().create(
+ perm_1 = UserPortfolioPermission.objects.all().create(
user=admin_user_1, portfolio=self.portfolio, roles=[UserPortfolioRoleChoices.ORGANIZATION_ADMIN]
)
@@ -2063,7 +2063,7 @@ class TestPortfolioAdmin(TestCase):
email="poopy@gov.gov",
)
- UserPortfolioPermission.objects.all().create(
+ perm_2 = UserPortfolioPermission.objects.all().create(
user=admin_user_2, portfolio=self.portfolio, roles=[UserPortfolioRoleChoices.ORGANIZATION_ADMIN]
)
@@ -2075,7 +2075,7 @@ class TestPortfolioAdmin(TestCase):
email="madmax@gov.gov",
)
- UserPortfolioPermission.objects.all().create(
+ perm_3 = UserPortfolioPermission.objects.all().create(
user=admin_user_3, portfolio=self.portfolio, roles=[UserPortfolioRoleChoices.ORGANIZATION_MEMBER]
)
@@ -2087,7 +2087,7 @@ class TestPortfolioAdmin(TestCase):
email="thematrix@gov.gov",
)
- UserPortfolioPermission.objects.all().create(
+ perm_4 = UserPortfolioPermission.objects.all().create(
user=admin_user_4,
portfolio=self.portfolio,
additional_permissions=[
@@ -2099,23 +2099,23 @@ class TestPortfolioAdmin(TestCase):
display_admins = self.admin.display_admins(self.portfolio)
self.assertIn(
- f'Gerald Meoward meaoward@gov.gov',
+ f'Gerald Meoward meaoward@gov.gov',
display_admins,
)
self.assertIn("Captain", display_admins)
self.assertIn(
- f'Arnold Poopy poopy@gov.gov', display_admins
+ f'Arnold Poopy poopy@gov.gov', display_admins
)
self.assertIn("Major", display_admins)
display_members_summary = self.admin.display_members_summary(self.portfolio)
self.assertIn(
- f'Mad Max madmax@gov.gov',
+ f'Mad Max madmax@gov.gov',
display_members_summary,
)
self.assertIn(
- f'Agent Smith thematrix@gov.gov',
+ f'Agent Smith thematrix@gov.gov',
display_members_summary,
)