diff --git a/src/registrar/admin.py b/src/registrar/admin.py index 12c5d8cf8..e13353fe6 100644 --- a/src/registrar/admin.py +++ b/src/registrar/admin.py @@ -2975,7 +2975,7 @@ class PortfolioAdmin(ListHeaderAdmin): Will be used in the after_help_text block.""" members = [user for user in obj.user.all() if "Admin" not in user.portfolio_role_summary] if not members: - return format_html("

No members found.

") + return '' member_details = ( "" diff --git a/src/registrar/templates/django/admin/includes/detail_table_fieldset.html b/src/registrar/templates/django/admin/includes/detail_table_fieldset.html index 5da6c2ca2..359897c04 100644 --- a/src/registrar/templates/django/admin/includes/detail_table_fieldset.html +++ b/src/registrar/templates/django/admin/includes/detail_table_fieldset.html @@ -140,7 +140,13 @@ This is using a custom implementation fieldset.html (see admin/fieldset.html) {% elif field.field.name == "display_admins" %}
{{ field.contents|safe }}
{% elif field.field.name == "display_members" %} -
{{ display_members_summary }}
+
+ {% if display_members_summary %} + {{ display_members_summary }} + {% else %} +

No members found.

+ {% endif %} +
{% else %}
{{ field.contents }}
{% endif %} @@ -244,7 +250,7 @@ This is using a custom implementation fieldset.html (see admin/fieldset.html) {% endif %} {% endwith %} - {% elif field.field.name == "display_members" %} + {% elif field.field.name == "display_members" and field.contents %}
Details
diff --git a/src/registrar/tests/test_models.py b/src/registrar/tests/test_models.py index 5b9d0ade3..2ab53a1c7 100644 --- a/src/registrar/tests/test_models.py +++ b/src/registrar/tests/test_models.py @@ -1233,19 +1233,19 @@ class TestUser(TestCase): ) def test_portfolio_role_summary_member_domain_requestor_domain_manager(self): # Test if the user has 'Member', 'Domain requestor', and 'Domain manager' roles - self.assertEqual(self.user.portfolio_role_summary, ["Member", "Domain requestor", "Domain manager"]) + self.assertEqual(self.user.portfolio_role_summary, ["Domain requestor", "Domain manager"]) @patch.multiple(User, has_base_portfolio_permission=lambda self: True, has_edit_requests=lambda self: True) def test_portfolio_role_summary_member_domain_requestor(self): # Test if the user has 'Member' and 'Domain requestor' roles - self.assertEqual(self.user.portfolio_role_summary, ["Member", "Domain requestor"]) + self.assertEqual(self.user.portfolio_role_summary, ["Domain requestor"]) @patch.multiple( User, has_base_portfolio_permission=lambda self: True, has_domains_portfolio_permission=lambda self: True ) def test_portfolio_role_summary_member_domain_manager(self): # Test if the user has 'Member' and 'Domain manager' roles - self.assertEqual(self.user.portfolio_role_summary, ["Member", "Domain manager"]) + self.assertEqual(self.user.portfolio_role_summary, ["Domain manager"]) @patch.multiple(User, has_base_portfolio_permission=lambda self: True) def test_portfolio_role_summary_member(self):
NameTitleEmail