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

Merged in [18016] from rjsparks@nostrum.com:

Browse source 
Ensure UTC time is shown throughout the interim request, approval, and announcement workflow. Fixes #2974.
 - Legacy-Id: 18017
Note: SVN reference [18016] has been migrated to Git commit 64de3fcd8c
This commit is contained in:
Henrik Levkowetz 2020-06-18 15:02:27 +00:00
parent 4033785d40 64de3fcd8c
commit 820e30d99d
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ietf/meeting/tests_views.py
View file

@ -1977,6 +1977,10 @@ class InterimTests(TestCase):
login_testing_unauthorized(self,"secretary",url)
r = self.client.get(url)
self.assertEqual(r.status_code, 200)
start_time = meeting.session_set.first().official_timeslotassignment().timeslot.time.strftime('%H:%M')
utc_start_time = meeting.session_set.first().official_timeslotassignment().timeslot.utc_start_time().strftime('%H:%M')
self.assertIn(start_time, unicontent(r))
self.assertIn(utc_start_time, unicontent(r))
def test_interim_request_details_announcement(self):
'''Test access to Announce / Skip Announce features'''

2
ietf/templates/meeting/interim_request_details.html
View file

@ -31,7 +31,7 @@
<dt>Date</dt>
<dd>{{ assignment.timeslot.time|date:"Y-m-d" }}
<dt>Start Time</dt>
<dd>{{ assignment.timeslot.time|date:"H:i" }}
<dd>{{ assignment.timeslot.time|date:"H:i" }} {% if meeting.time_zone != 'UTC' %}( {{ assignment.timeslot.utc_start_time|date:"H:i"}} UTC ){% endif %}
<dt>Duration</dt>
<dd>{{ assignment.session.requested_duration|format_timedelta }}
<dt>Remote Instructions</dt>