Skip to content

Commit

Permalink
Populate interim approved email correctly. Fixes #3150. Commit ready …
Browse files Browse the repository at this point in the history
…for merge.

 - Legacy-Id: 18748
  • Loading branch information
rjsparks committed Dec 11, 2020
1 parent c9f7b18 commit 21b05d0
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 2 additions & 0 deletions ietf/meeting/helpers.py
Expand Up @@ -585,6 +585,8 @@ def send_interim_approval(user, meeting):
template = 'meeting/interim_approval.txt'
context = {
'meeting': meeting,
'group': first_session.group,
'requester': session_requested_by(first_session),
}
send_mail(None,
to_email,
Expand Down
4 changes: 3 additions & 1 deletion ietf/meeting/tests_views.py
Expand Up @@ -38,7 +38,7 @@
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.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.name.models import SessionStatusName, ImportantDateName, RoleName
from ietf.utils.decorators import skip_coverage
Expand Down Expand Up @@ -2253,6 +2253,8 @@ def test_interim_request_single_virtual_settings_approval_not_required(self):
self.assertEqual(meeting.session_set.last().schedulingevent_set.last().status_id,'scheda')
self.assertIn('iesg-secretary@ietf.org', outbox[-1]['To'])
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):
make_meeting_test_data()
Expand Down

0 comments on commit 21b05d0

Please sign in to comment.