Skip to content

fix: provide settings to render_to_string for IPR notification emails #4357

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rjsparks merged 3 commits into from
Aug 26, 2022
Merged

fix: provide settings to render_to_string for IPR notification emails #4357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8687161
Pass settings into the context
larseggert Aug 23, 2022
7700401
Merge branch 'main' into fix-4340
larseggert Aug 26, 2022
9823a83
fix: test changes to the ipr notification message content
rjsparks Aug 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ietf/ipr/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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')
Expand All @@ -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()
Expand Down
3 changes: 3 additions & 0 deletions ietf/ipr/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand All @@ -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)
Expand Down