From bd09473532a5679318d7586d898a2d4648d1b683 Mon Sep 17 00:00:00 2001 From: Valentin Deniaud Date: Wed, 22 May 2019 15:23:00 +0200 Subject: [PATCH] a2_rbac: fix RoleParenting.__str__ magic method (#33328) --- src/authentic2/a2_rbac/models.py | 3 ++- tests/test_data_transfer.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/authentic2/a2_rbac/models.py b/src/authentic2/a2_rbac/models.py index aa99485f..a379eaf0 100644 --- a/src/authentic2/a2_rbac/models.py +++ b/src/authentic2/a2_rbac/models.py @@ -322,7 +322,8 @@ class RoleParenting(RoleParentingAbstractBase): verbose_name_plural = _('role parenting relations') def __str__(self): - return self.name + return u'{0} {1}> {2}'.format(self.parent.name, '-' if self.direct else '~', + self.child.name) class RoleAttribute(models.Model): diff --git a/tests/test_data_transfer.py b/tests/test_data_transfer.py index 43543a3f..afcae42a 100644 --- a/tests/test_data_transfer.py +++ b/tests/test_data_transfer.py @@ -466,7 +466,8 @@ def test_import_role_handle_manager_role_parenting(db): import_site({'roles': [child_role_dict, parent_role_dict]}, ImportContext()) child = Role.objects.get(slug='child-role') manager = Role.objects.get(slug='_a2-managers-of-role-grand-parent-role') - RoleParenting.objects.get(child=child, parent=manager, direct=True) + rp = RoleParenting.objects.get(child=child, parent=manager, direct=True) + assert str(rp) def test_import_roles_role_delete_orphans(db): -- 2.20.1