From c2b40c3da8e3912921e895dcd20605347182c312 Mon Sep 17 00:00:00 2001 From: Tom Pusateri Date: Tue, 31 Mar 2020 04:39:00 +0000 Subject: [PATCH] Add interim meetings to agenda.json API. Fixes #2946. Commit ready for merge. - Legacy-Id: 17564 --- ietf/meeting/tests_views.py | 7 +++++++ ietf/meeting/urls.py | 1 + ietf/meeting/views.py | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ietf/meeting/tests_views.py b/ietf/meeting/tests_views.py index ade11103c..75daeafe2 100644 --- a/ietf/meeting/tests_views.py +++ b/ietf/meeting/tests_views.py @@ -2047,6 +2047,13 @@ class IphoneAppJsonTests(TestCase): def tearDown(self): pass + def test_iphone_app_json_interim(self): + make_meeting_test_data() + meeting = Meeting.objects.filter(type_id='interim').order_by('id').last() + url = urlreverse('ietf.meeting.views.json_agenda',kwargs={'num':meeting.number}) + r = self.client.get(url) + self.assertEqual(r.status_code,200) + def test_iphone_app_json(self): make_meeting_test_data() meeting = Meeting.objects.filter(type_id='ietf').order_by('id').last() diff --git a/ietf/meeting/urls.py b/ietf/meeting/urls.py index 0691eaa26..ad3b967bf 100644 --- a/ietf/meeting/urls.py +++ b/ietf/meeting/urls.py @@ -69,6 +69,7 @@ type_interim_patterns = [ url(r'^agenda/(?P[A-Za-z0-9-]+)-drafts.pdf$', views.session_draft_pdf), url(r'^agenda/(?P[A-Za-z0-9-]+)-drafts.tgz$', views.session_draft_tarfile), url(r'^materials/%(document)s((?P\.[a-z0-9]+)|/)?$' % settings.URL_REGEXPS, views.materials_document), + url(r'^agenda.json$', views.json_agenda) ] type_ietf_only_patterns_id_optional = [ diff --git a/ietf/meeting/views.py b/ietf/meeting/views.py index 45ee294c4..0df6bc2da 100644 --- a/ietf/meeting/views.py +++ b/ietf/meeting/views.py @@ -962,7 +962,7 @@ def ical_agenda(request, num=None, name=None, acronym=None, session_id=None): @cache_page(15 * 60) def json_agenda(request, num=None ): - meeting = get_meeting(num) + meeting = get_meeting(num, type_in=['ietf','interim']) sessions = [] locations = set()