diff --git a/src/registrar/admin.py b/src/registrar/admin.py index 9342460fa..6ab48e28d 100644 --- a/src/registrar/admin.py +++ b/src/registrar/admin.py @@ -3006,7 +3006,10 @@ class PortfolioAdmin(ListHeaderAdmin): def get_user_portfolio_permission_admins(self, obj): """Returns each admin on UserPortfolioPermission for a given portfolio.""" - return obj.portfolio_users.filter(portfolio=obj, roles__contains=[UserPortfolioRoleChoices.ORGANIZATION_ADMIN]) + if obj: + return obj.portfolio_users.filter(portfolio=obj, roles__contains=[UserPortfolioRoleChoices.ORGANIZATION_ADMIN]) + else: + return [] def get_non_admin_users(self, obj): # Filter UserPortfolioPermission objects related to the portfolio that do NOT have the "Admin" role @@ -3021,7 +3024,10 @@ class PortfolioAdmin(ListHeaderAdmin): def get_user_portfolio_permission_non_admins(self, obj): """Returns each admin on UserPortfolioPermission for a given portfolio.""" - return obj.portfolio_users.exclude(roles__contains=[UserPortfolioRoleChoices.ORGANIZATION_ADMIN]) + if obj: + return obj.portfolio_users.exclude(roles__contains=[UserPortfolioRoleChoices.ORGANIZATION_ADMIN]) + else: + return [] def display_admins(self, obj): """Get joined users who are Admin, unpack and return an HTML block. @@ -3042,7 +3048,9 @@ class PortfolioAdmin(ListHeaderAdmin): address_id = f"portfolio-administrator-{portfolio_admin.pk}" if len(admins) > 1: admin_details += ( - f'' + f'' ) admin_details += f'
' admin_details += f'{escape(portfolio_admin.user)}
' diff --git a/src/registrar/models/user_portfolio_permission.py b/src/registrar/models/user_portfolio_permission.py index a55c04e5c..112d93009 100644 --- a/src/registrar/models/user_portfolio_permission.py +++ b/src/registrar/models/user_portfolio_permission.py @@ -80,7 +80,7 @@ class UserPortfolioPermission(TimeStampedModel): readable_roles = sorted( [UserPortfolioRoleChoices.get_user_portfolio_role_label(role) for role in self.roles] ) - return f"{self.user}' " f"" if self.roles else "" + return f"{self.user}" f" " if self.roles else "" def get_readable_roles(self): """Returns a list of labels of each role in self.roles""" diff --git a/src/registrar/registrar_middleware.py b/src/registrar/registrar_middleware.py index 5a75577df..6346ed4fd 100644 --- a/src/registrar/registrar_middleware.py +++ b/src/registrar/registrar_middleware.py @@ -49,11 +49,13 @@ class CheckUserProfileMiddleware: self.setup_page, self.logout_page, "/admin", + "/__debug__", ] self.other_excluded_pages = [ self.profile_page, self.logout_page, "/admin", + "/__debug__", ] self.excluded_pages = {