From 5925bb7af4fb6eec9f555cdca06a5367fcf45ba5 Mon Sep 17 00:00:00 2001 From: Emmanuel Cazenave Date: Tue, 8 Jun 2021 18:36:15 +0200 Subject: [PATCH] admin: expand map() result (#54673) --- docbow_project/docbow/models.py | 4 +++- tests/main/test_main.py | 13 +++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/docbow_project/docbow/models.py b/docbow_project/docbow/models.py index 647c483..141947f 100644 --- a/docbow_project/docbow/models.py +++ b/docbow_project/docbow/models.py @@ -545,7 +545,9 @@ class AutomaticForwarding(Model): ctx = { 'filetypes': list_to_csv(self.filetypes.all()), 'originaly_to_user': list_to_csv(map(username, self.originaly_to_user.all())), - 'to': list_to_csv(map(username, self.forward_to_user.all()) + list(self.forward_to_list.all())), + 'to': list_to_csv( + list(map(username, self.forward_to_user.all())) + list(self.forward_to_list.all()) + ), } assert self.filetypes.all() or self.originaly_to_user.all() if self.filetypes.all() and self.originaly_to_user.all(): diff --git a/tests/main/test_main.py b/tests/main/test_main.py index 0440201..bd5f19f 100644 --- a/tests/main/test_main.py +++ b/tests/main/test_main.py @@ -35,6 +35,7 @@ from docbow_project.docbow.models import ( all_emails, is_guest, NotificationPreference, + AutomaticForwarding, ) from docbow_project.docbow.notification import MailNotifier from docbow_project.docbow.upload_views import file_response @@ -583,6 +584,18 @@ def test_admin_notification(admin, users_fixture, filetype_fixtures, client): assert resp.status_code == 200 +@pytest.mark.django_db +def test_admin_automaticforwarding(admin, users_fixture, filetype_fixtures, client): + user = users_fixture[0] + at = AutomaticForwarding.objects.create() + at.filetypes.add(filetype_fixtures[0]) + at.originaly_to_user.add(admin) + at.forward_to_user.add(user) + client.login(username='admin', password='admin') + resp = client.get('/admin/docbow/automaticforwarding/') + assert resp.status_code == 200 + + @pytest.mark.django_db def test_delegate_login(client): recipient = User.objects.create(username='recipient')