From 86871613831a0e109c186855312edee47106d617 Mon Sep 17 00:00:00 2001 From: Lars Eggert Date: Tue, 23 Aug 2022 11:54:50 +0200 Subject: [PATCH 1/2] Pass settings into the context Fixes #4340 --- ietf/ipr/views.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ietf/ipr/views.py b/ietf/ipr/views.py index e290bf14d31..bc6099b3f6c 100644 --- a/ietf/ipr/views.py +++ b/ietf/ipr/views.py @@ -80,6 +80,7 @@ def get_document_emails(ipr): author_names = ', '.join(a.person.name for a in doc.documentauthor_set.select_related("person")) context = dict( + settings=settings, doc_info=doc_info, to_email=addrs.to, to_name=author_names, @@ -97,6 +98,7 @@ def get_posted_emails(ipr): addrs = gather_address_lists('ipr_posting_confirmation',ipr=ipr).as_strings(compact=False) context = dict( + settings=settings, to_email=addrs.to, to_name=ipr.submitter_name, cc_email=addrs.cc, @@ -112,6 +114,7 @@ def get_posted_emails(ipr): if isinstance(ipr, (GenericIprDisclosure,NonDocSpecificIprDisclosure)): role = Role.objects.filter(group__acronym='gen',name='ad').first() context = dict( + settings=settings, to_email=role.email.address, to_name=role.person.name, ipr=ipr) From 9823a83f3971fafb50b57fdb3214b73633ada594 Mon Sep 17 00:00:00 2001 From: Robert Sparks Date: Fri, 26 Aug 2022 13:32:53 -0500 Subject: [PATCH 2/2] fix: test changes to the ipr notification message content --- ietf/ipr/tests.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ietf/ipr/tests.py b/ietf/ipr/tests.py index 5b389683266..db9c1371e42 100644 --- a/ietf/ipr/tests.py +++ b/ietf/ipr/tests.py @@ -9,6 +9,7 @@ from urllib.parse import quote, urlparse from django.urls import reverse as urlreverse +from django.conf import settings import debug # pyflakes:ignore @@ -575,6 +576,8 @@ def test_notify(self): self.assertTrue('draft-ietf-mars-test@ietf.org' in outbox[len_before+1]['To']) self.assertTrue('mars-wg@ietf.org' in outbox[len_before+1]['Cc']) self.assertIn('Secretariat on '+ipr.get_latest_event_submitted().time.strftime("%Y-%m-%d"), get_payload_text(outbox[len_before+1]).replace('\n',' ')) + self.assertIn(f'{settings.IDTRACKER_BASE_URL}{urlreverse("ietf.ipr.views.showlist")}', get_payload_text(outbox[len_before]).replace('\n',' ')) + self.assertIn(f'{settings.IDTRACKER_BASE_URL}{urlreverse("ietf.ipr.views.history",kwargs=dict(id=ipr.pk))}', get_payload_text(outbox[len_before+1]).replace('\n',' ')) def test_notify_generic(self): RoleFactory(name_id='ad',group__acronym='gen') @@ -591,6 +594,7 @@ def test_notify_generic(self): self.assertEqual(r.status_code,302) self.assertEqual(len(outbox),2) self.assertIn('Secretariat on '+ipr.get_latest_event_submitted().time.strftime("%Y-%m-%d"), get_payload_text(outbox[1]).replace('\n',' ')) + self.assertIn(f'{settings.IDTRACKER_BASE_URL}{urlreverse("ietf.ipr.views.showlist")}', get_payload_text(outbox[1]).replace('\n',' ')) def send_ipr_email_helper(self): ipr = HolderIprDisclosureFactory()