From 2046216f6908d9669bcdbbf57c74aa6ed101442d Mon Sep 17 00:00:00 2001 From: Valentin Deniaud Date: Wed, 10 Mar 2021 17:04:29 +0100 Subject: [PATCH] manager: include ou in roles csv export (#45809) --- src/authentic2/manager/resources.py | 7 ++++++- tests/test_role_manager.py | 5 +++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/authentic2/manager/resources.py b/src/authentic2/manager/resources.py index 410de2fc..8989d69b 100644 --- a/src/authentic2/manager/resources.py +++ b/src/authentic2/manager/resources.py @@ -67,5 +67,10 @@ class RoleResource(ModelResource): class Meta: model = Role - fields = ('name', 'slug', 'members') + fields = ('name', 'slug', 'members', 'ou') export_order = fields + widgets = { + 'ou': { + 'field': 'name', + } + } diff --git a/tests/test_role_manager.py b/tests/test_role_manager.py index be869077..003c0b40 100644 --- a/tests/test_role_manager.py +++ b/tests/test_role_manager.py @@ -43,9 +43,10 @@ def test_manager_role_export(app, admin, ou1, role_ou1, ou2, role_ou2): reader = csv.reader([force_text(line) for line in export_response.body.split(force_bytes('\r\n'))], delimiter=',') rows = [row for row in reader] - assert rows[0] == ['name', 'slug', 'members'] + assert rows[0] == ['name', 'slug', 'members', 'ou'] assert len(rows)-2 == 2 # csv header and last EOL assert set([row[1] for row in rows[1:3]]) == set(['role_ou1', 'role_ou2']) + assert set([row[3] for row in rows[1:3]]) == set(['OU1', 'OU2']) response.form.set('search-text', 'role_ou1') search_response = response.form.submit() @@ -61,7 +62,7 @@ def test_manager_role_export(app, admin, ou1, role_ou1, ou2, role_ou2): reader = csv.reader([force_text(line) for line in export_response.body.split(force_bytes('\r\n'))], delimiter=',') rows = [row for row in reader] - assert rows[0] == ['name', 'slug', 'members'] + assert rows[0] == ['name', 'slug', 'members', 'ou'] assert len(rows)-2 == 1 # csv header and last EOL assert rows[1][1] == 'role_ou1' -- 2.20.1