Skip to content

Commit 38a24b5

Browse files
committed
Fix parameter validations in meeting.views.ajax_get_utc(). Fixes 2023. Also fix pyflakes error. Commit ready for merge
- Legacy-Id: 12334
1 parent b04d07e commit 38a24b5

2 files changed

Lines changed: 6 additions & 2 deletions

File tree

ietf/meeting/tests_views.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1290,6 +1290,11 @@ def test_ajax_get_utc(self):
12901290
self.assertEqual(r.status_code, 200)
12911291
data = json.loads(r.content)
12921292
self.assertEqual(data["error"], True)
1293+
url = urlreverse('ietf.meeting.views.ajax_get_utc') + "?date=2016-1-1&time=10:00am&timezone=UTC"
1294+
r = self.client.get(url)
1295+
self.assertEqual(r.status_code, 200)
1296+
data = json.loads(r.content)
1297+
self.assertEqual(data["error"], True)
12931298
# test good query
12941299
url = urlreverse('ietf.meeting.views.ajax_get_utc') + "?date=2016-1-1&time=12:00&timezone=US/Pacific"
12951300
r = self.client.get(url)

ietf/meeting/views.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1603,7 +1603,7 @@ def ajax_get_utc(request):
16031603
time = request.GET.get('time')
16041604
timezone = request.GET.get('timezone')
16051605
date = request.GET.get('date')
1606-
time_re = re.compile(r'^\d{2}:\d{2}')
1606+
time_re = re.compile(r'^\d{2}:\d{2}$')
16071607
# validate input
16081608
if not time_re.match(time) or not date:
16091609
return HttpResponse(json.dumps({'error': True}),
@@ -1676,7 +1676,6 @@ def interim_skip_announcement(request, number):
16761676
first announcing. Only applicable to IRTF groups.
16771677
'''
16781678
meeting = get_object_or_404(Meeting, number=number)
1679-
group = meeting.session_set.first().group
16801679

16811680
if request.method == 'POST':
16821681
meeting.session_set.update(status_id='sched')

0 commit comments

Comments
 (0)