altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

Populate interim approved email correctly. Fixes #3150. Commit ready for merge.

Browse source 
- Legacy-Id: 18748
This commit is contained in:
Robert Sparks 2020-12-11 15:03:36 +00:00
parent c9f7b18981
commit 21b05d003c
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ietf/meeting/helpers.py
View file

@ -585,6 +585,8 @@ def send_interim_approval(user, meeting):
template = 'meeting/interim_approval.txt' template = 'meeting/interim_approval.txt'
context = { context = {
'meeting': meeting, 'meeting': meeting,
'group': first_session.group,
'requester': session_requested_by(first_session),
} }
send_mail(None, send_mail(None,
to_email, to_email,

4
ietf/meeting/tests_views.py
View file

@ -38,7 +38,7 @@ from ietf.meeting.helpers import send_interim_minutes_reminder, populate_importa
from ietf.meeting.models import Session, TimeSlot, Meeting, SchedTimeSessAssignment, Schedule, SessionPresentation, SlideSubmission, SchedulingEvent, Room, Constraint, ConstraintName from ietf.meeting.models import Session, TimeSlot, Meeting, SchedTimeSessAssignment, Schedule, SessionPresentation, SlideSubmission, SchedulingEvent, Room, Constraint, ConstraintName
from ietf.meeting.test_data import make_meeting_test_data, make_interim_meeting, make_interim_test_data from ietf.meeting.test_data import make_meeting_test_data, make_interim_meeting, make_interim_test_data
from ietf.meeting.utils import finalize, condition_slide_order from ietf.meeting.utils import finalize, condition_slide_order
from ietf.meeting.utils import add_event_info_to_session_qs from ietf.meeting.utils import add_event_info_to_session_qs, session_requested_by
from ietf.meeting.views import session_draft_list, parse_agenda_filter_params from ietf.meeting.views import session_draft_list, parse_agenda_filter_params
from ietf.name.models import SessionStatusName, ImportantDateName, RoleName from ietf.name.models import SessionStatusName, ImportantDateName, RoleName
from ietf.utils.decorators import skip_coverage from ietf.utils.decorators import skip_coverage
@ -2253,6 +2253,8 @@ class InterimTests(TestCase):
self.assertEqual(meeting.session_set.last().schedulingevent_set.last().status_id,'scheda') self.assertEqual(meeting.session_set.last().schedulingevent_set.last().status_id,'scheda')
self.assertIn('iesg-secretary@ietf.org', outbox[-1]['To']) self.assertIn('iesg-secretary@ietf.org', outbox[-1]['To'])
self.assertIn('interim meeting ready for announcement', outbox[-1]['Subject']) self.assertIn('interim meeting ready for announcement', outbox[-1]['Subject'])
self.assertIn(f'interim meeting for {meeting.session_set.first().group.acronym} has been approved',get_payload_text(outbox[-2]))
self.assertIn(f'Session Requester: { session_requested_by(meeting.session_set.first()) }', get_payload_text(outbox[-2]))
def test_interim_request_single_in_person(self): def test_interim_request_single_in_person(self):
make_meeting_test_data() make_meeting_test_data()