column changes in tables

src/registrar/admin.py

@@ -1473,7 +1473,7 @@ class UserPortfolioPermissionAdmin(ListHeaderAdmin):
         readable_roles = obj.get_readable_roles()
         return ", ".join(readable_roles)
 
-    get_roles.short_description = "Roles"  # type: ignore
+    get_roles.short_description = "Member access"  # type: ignore
 
     def delete_queryset(self, request, queryset):
         """We override the delete method in the model.
@@ -1786,8 +1786,7 @@ class PortfolioInvitationAdmin(BaseInvitationAdmin):
     list_display = [
         "email",
         "portfolio",
-        "roles",
+        "get_roles",
-        "additional_permissions",
         "status",
     ]
 
@@ -1814,6 +1813,12 @@ class PortfolioInvitationAdmin(BaseInvitationAdmin):
     delete_confirmation_template = "django/admin/portfolio_invitation_delete_confirmation.html"
     delete_selected_confirmation_template = "django/admin/portfolio_invitation_delete_selected_confirmation.html"
 
+    def get_roles(self, obj):
+        readable_roles = obj.get_readable_roles()
+        return ", ".join(readable_roles)
+    
+    get_roles.short_description = "Member access"  # type: ignore
+    
     # Select portfolio invitations to change -> Portfolio invitations
     def changelist_view(self, request, extra_context=None):
         if extra_context is None:

src/registrar/models/portfolio_invitation.py

@@ -15,6 +15,7 @@ from .utility.portfolio_helper import (
     get_domains_display,
     get_members_description_display,
     get_members_display,
+    get_readable_roles,
     get_role_display,
     validate_portfolio_invitation,
 )  # type: ignore
@@ -78,6 +79,10 @@ class PortfolioInvitation(TimeStampedModel):
     def __str__(self):
         return f"Invitation for {self.email} on {self.portfolio} is {self.status}"
 
+    def get_readable_roles(self):
+        """Returns a readable list of self.roles"""
+        return get_readable_roles(self.roles)
+    
     def get_managed_domains_count(self):
         """Return the count of domain invitations managed by the invited user for this portfolio."""
         # Filter the UserDomainRole model to get domains where the user has a manager role

src/registrar/models/user_portfolio_permission.py

@@ -12,6 +12,7 @@ from registrar.models.utility.portfolio_helper import (
     get_domains_description_display,
     get_members_display,
     get_members_description_display,
+    get_readable_roles,
     get_role_display,
     validate_user_portfolio_permission,
 )
@@ -94,12 +95,7 @@ class UserPortfolioPermission(TimeStampedModel):
 
     def get_readable_roles(self):
         """Returns a readable list of self.roles"""
-        readable_roles = []
+        return get_readable_roles(self.roles)
-        if self.roles:
-            readable_roles = sorted(
-                [UserPortfolioRoleChoices.get_user_portfolio_role_label(role) for role in self.roles]
-            )
-        return readable_roles
 
     def get_managed_domains_count(self):
         """Return the count of domains managed by the user for this portfolio."""

src/registrar/models/utility/portfolio_helper.py

@@ -79,6 +79,14 @@ class MemberPermissionDisplay(StrEnum):
     NONE = "None"
 
 
+def get_readable_roles(roles):
+    readable_roles = []
+    if roles:
+        readable_roles = sorted(
+            [UserPortfolioRoleChoices.get_user_portfolio_role_label(role) for role in roles]
+        )
+    return readable_roles
+
 def get_role_display(roles):
     """
     Returns a user-friendly display name for a given list of user roles.