This commit is contained in:
Rachid Mrad 2024-08-30 17:44:09 -04:00
parent ca1c9bbb04
commit e20bfa5567
No known key found for this signature in database
2 changed files with 7 additions and 7 deletions

View file

@ -3085,11 +3085,7 @@ class PortfolioAdmin(ListHeaderAdmin):
+ "<th>Phone</th><th>Roles</th></tr></thead><tbody>"
)
for member in members:
full_name = (
f"{member.first_name} {member.middle_name} {member.last_name}"
if member.middle_name
else f"{member.first_name} {member.last_name}"
)
full_name = member.get_formatted_name()
member_details += "<tr>"
member_details += f"<td>{full_name}</td>"
member_details += f"<td>{member.title}</td>"

View file

@ -1357,13 +1357,17 @@ class TestUser(TestCase):
# Test if the user has 'Member', 'Domain requestor', and 'Domain manager' roles
self.assertEqual(self.user.portfolio_role_summary(self.portfolio), ["Domain requestor", "Domain manager"])
@patch.multiple(User, has_base_portfolio_permission=lambda self, portfolio: True, has_edit_requests=lambda self, portfolio: True)
@patch.multiple(
User, has_base_portfolio_permission=lambda self, portfolio: True, has_edit_requests=lambda self, portfolio: 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(self.portfolio), ["Domain requestor"])
@patch.multiple(
User, has_base_portfolio_permission=lambda self, portfolio: True, has_domains_portfolio_permission=lambda self, portfolio: True
User,
has_base_portfolio_permission=lambda self, portfolio: True,
has_domains_portfolio_permission=lambda self, portfolio: True,
)
def test_portfolio_role_summary_member_domain_manager(self):
# Test if the user has 'Member' and 'Domain manager' roles