From 05390ebb7a8ca97303acb51b33b6e10d4812ef48 Mon Sep 17 00:00:00 2001 From: Robert Sparks Date: Thu, 26 Aug 2021 22:42:37 +0000 Subject: [PATCH] r19301 on session request notificaiton email was faulty (buffers reverted between test and commit). This corrects it. Commit ready for merge. - Legacy-Id: 19304 --- ietf/secr/sreq/tests.py | 2 +- ietf/secr/templates/includes/session_info.txt | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ietf/secr/sreq/tests.py b/ietf/secr/sreq/tests.py index a2c9fc11e..9beb96ed7 100644 --- a/ietf/secr/sreq/tests.py +++ b/ietf/secr/sreq/tests.py @@ -451,7 +451,7 @@ class SubmitRequestCase(TestCase): self.assertTrue("Can't meet: Thursday early afternoon, Thursday late" in notification_payload) self.assertTrue('Second session joint with: {}'.format(group3.acronym) in notification_payload) self.assertTrue(ad.ascii_name() in notification_payload) - self.assertIn(ConstraintName.objects.get(slug='chair_confict').name, notification_payload) + self.assertIn(ConstraintName.objects.get(slug='chair_conflict').name, notification_payload) self.assertIn(group.acronym, notification_payload) class LockAppTestCase(TestCase): diff --git a/ietf/secr/templates/includes/session_info.txt b/ietf/secr/templates/includes/session_info.txt index 8e7b62e59..db22a520b 100644 --- a/ietf/secr/templates/includes/session_info.txt +++ b/ietf/secr/templates/includes/session_info.txt @@ -9,8 +9,10 @@ Number of Sessions: {{ session.num_session }} Length of Session(s): {{ session.length_session1|display_duration }}{% if session.length_session2 %}, {{ session.length_session2|display_duration }}{% endif %}{% if session.length_session3 %}, {{ session.length_session3|display_duration }}{% endif %} Number of Attendees: {{ session.attendees }} Conflicts to Avoid: -{% for line in session.outbound_conflicts %}{{line}} -{% endfor %} +{% for line in session.outbound_conflicts %} {{line}} +{% endfor %}{% if session.session_time_relation_display %} {{ session.session_time_relation_display }}{% endif %} +{% if session.adjacent_with_wg %} Adjacent with WG: {{ session.adjacent_with_wg }}{% endif %} +{% if session.timeranges_display %} Can't meet: {{ session.timeranges_display|join:", " }}{% endif %} People who must be present: {% for person in session.bethere %} {{ person.ascii_name }}