Skip to content

Commit 64de3fc

Browse files
committed
Ensure UTC time is shown throughout the interim request, approval, and announcement workflow. Fixes ietf-tools#2974. Commit ready for merge.
- Legacy-Id: 18016
1 parent 26dbcc8 commit 64de3fc

2 files changed

Lines changed: 5 additions & 1 deletion

File tree

ietf/meeting/tests_views.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1977,6 +1977,10 @@ def test_interim_request_details(self):
19771977
login_testing_unauthorized(self,"secretary",url)
19781978
r = self.client.get(url)
19791979
self.assertEqual(r.status_code, 200)
1980+
start_time = meeting.session_set.first().official_timeslotassignment().timeslot.time.strftime('%H:%M')
1981+
utc_start_time = meeting.session_set.first().official_timeslotassignment().timeslot.utc_start_time().strftime('%H:%M')
1982+
self.assertIn(start_time, unicontent(r))
1983+
self.assertIn(utc_start_time, unicontent(r))
19801984

19811985
def test_interim_request_details_announcement(self):
19821986
'''Test access to Announce / Skip Announce features'''

ietf/templates/meeting/interim_request_details.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ <h1>Interim Meeting Request Details</h1>
3131
<dt>Date</dt>
3232
<dd>{{ assignment.timeslot.time|date:"Y-m-d" }}
3333
<dt>Start Time</dt>
34-
<dd>{{ assignment.timeslot.time|date:"H:i" }}
34+
<dd>{{ assignment.timeslot.time|date:"H:i" }} {% if meeting.time_zone != 'UTC' %}( {{ assignment.timeslot.utc_start_time|date:"H:i"}} UTC ){% endif %}
3535
<dt>Duration</dt>
3636
<dd>{{ assignment.session.requested_duration|format_timedelta }}
3737
<dt>Remote Instructions</dt>

0 commit comments

Comments
 (0)