Merged in [17564] from pusateri@bangj.com:

Added interim meetings to agenda.json API. Fixes #2946.
 - Legacy-Id: 17571
Note: SVN reference [17564] has been migrated to Git commit c2b40c3da8

ietf/meeting/tests_views.py

@@ -2074,6 +2074,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()

ietf/meeting/urls.py

@@ -69,6 +69,7 @@ type_interim_patterns = [
     url(r'^agenda/(?P<session>[A-Za-z0-9-]+)-drafts.pdf$', views.session_draft_pdf),
     url(r'^agenda/(?P<session>[A-Za-z0-9-]+)-drafts.tgz$', views.session_draft_tarfile),
     url(r'^materials/%(document)s((?P<ext>\.[a-z0-9]+)|/)?$' % settings.URL_REGEXPS, views.materials_document),
+    url(r'^agenda.json$', views.json_agenda)
 ]
 
 type_ietf_only_patterns_id_optional = [

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()