Skip to content

Commit 088d953

Browse files
larseggertrjsparks
andauthored
fix: provide settings to render_to_string for IPR notification emails (ietf-tools#4357)
* Pass settings into the context Fixes ietf-tools#4340 * fix: test changes to the ipr notification message content Co-authored-by: Robert Sparks <rjsparks@nostrum.com>
1 parent e666894 commit 088d953

2 files changed

Lines changed: 7 additions & 0 deletions

File tree

ietf/ipr/tests.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
from urllib.parse import quote, urlparse
1010

1111
from django.urls import reverse as urlreverse
12+
from django.conf import settings
1213

1314
import debug # pyflakes:ignore
1415

@@ -575,6 +576,8 @@ def test_notify(self):
575576
self.assertTrue('draft-ietf-mars-test@ietf.org' in outbox[len_before+1]['To'])
576577
self.assertTrue('mars-wg@ietf.org' in outbox[len_before+1]['Cc'])
577578
self.assertIn('Secretariat on '+ipr.get_latest_event_submitted().time.strftime("%Y-%m-%d"), get_payload_text(outbox[len_before+1]).replace('\n',' '))
579+
self.assertIn(f'{settings.IDTRACKER_BASE_URL}{urlreverse("ietf.ipr.views.showlist")}', get_payload_text(outbox[len_before]).replace('\n',' '))
580+
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',' '))
578581

579582
def test_notify_generic(self):
580583
RoleFactory(name_id='ad',group__acronym='gen')
@@ -591,6 +594,7 @@ def test_notify_generic(self):
591594
self.assertEqual(r.status_code,302)
592595
self.assertEqual(len(outbox),2)
593596
self.assertIn('Secretariat on '+ipr.get_latest_event_submitted().time.strftime("%Y-%m-%d"), get_payload_text(outbox[1]).replace('\n',' '))
597+
self.assertIn(f'{settings.IDTRACKER_BASE_URL}{urlreverse("ietf.ipr.views.showlist")}', get_payload_text(outbox[1]).replace('\n',' '))
594598

595599
def send_ipr_email_helper(self):
596600
ipr = HolderIprDisclosureFactory()

ietf/ipr/views.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ def get_document_emails(ipr):
8080
author_names = ', '.join(a.person.name for a in doc.documentauthor_set.select_related("person"))
8181

8282
context = dict(
83+
settings=settings,
8384
doc_info=doc_info,
8485
to_email=addrs.to,
8586
to_name=author_names,
@@ -97,6 +98,7 @@ def get_posted_emails(ipr):
9798

9899
addrs = gather_address_lists('ipr_posting_confirmation',ipr=ipr).as_strings(compact=False)
99100
context = dict(
101+
settings=settings,
100102
to_email=addrs.to,
101103
to_name=ipr.submitter_name,
102104
cc_email=addrs.cc,
@@ -112,6 +114,7 @@ def get_posted_emails(ipr):
112114
if isinstance(ipr, (GenericIprDisclosure,NonDocSpecificIprDisclosure)):
113115
role = Role.objects.filter(group__acronym='gen',name='ad').first()
114116
context = dict(
117+
settings=settings,
115118
to_email=role.email.address,
116119
to_name=role.person.name,
117120
ipr=ipr)

0 commit comments

Comments
 (0)