Renamed some view funtions for consistency. Almost all .json enpoints were named *_json(), but not all. Fixed in this commit, together with the equivalent renaiming for one .ical endpoint.

- Legacy-Id: 17855

ietf/meeting/tests_views.py

@@ -197,7 +197,7 @@ class MeetingTests(TestCase):
         self.assertNotContains(r, session.materials.filter(type='slides',states__type__slug='slides',states__slug='deleted').first().uploaded_filename)
 
         # iCal
-        r = self.client.get(urlreverse("ietf.meeting.views.ical_agenda", kwargs=dict(num=meeting.number))
+        r = self.client.get(urlreverse("ietf.meeting.views.agenda_ical", kwargs=dict(num=meeting.number))
                             + "?" + session.group.parent.acronym.upper())
         self.assertContains(r, session.group.acronym)
         self.assertContains(r, session.group.name)
@@ -503,7 +503,7 @@ class MeetingTests(TestCase):
         s2 = SessionFactory.create(meeting=meeting, group=s1.group, add_to_schedule=False)
         SchedTimeSessAssignment.objects.create(timeslot=t2, session=s2, schedule=meeting.schedule)
         #
-        url = urlreverse('ietf.meeting.views.ical_agenda', kwargs={'num':meeting.number, 'acronym':s1.group.acronym, })
+        url = urlreverse('ietf.meeting.views.agenda_ical', kwargs={'num':meeting.number, 'acronym':s1.group.acronym, })
         r = self.client.get(url)
         self.assertEqual(r.get('Content-Type'), "text/calendar")
         self.assertContains(r, 'BEGIN:VEVENT')
@@ -513,7 +513,7 @@ class MeetingTests(TestCase):
         self.assertContains(r, t2.time.strftime('%Y%m%dT%H%M%S'))
         self.assertContains(r, 'END:VEVENT')
         #
-        url = urlreverse('ietf.meeting.views.ical_agenda', kwargs={'num':meeting.number, 'session_id':s1.id, })
+        url = urlreverse('ietf.meeting.views.agenda_ical', kwargs={'num':meeting.number, 'session_id':s1.id, })
         r = self.client.get(url)
         self.assertEqual(r.get('Content-Type'), "text/calendar")
         self.assertContains(r, 'BEGIN:VEVENT')
@@ -606,7 +606,7 @@ class MeetingTests(TestCase):
 
     def test_cancelled_ics(self):
         session=SessionFactory(meeting__type_id='ietf',status_id='canceled')
-        url = urlreverse('ietf.meeting.views.ical_agenda', kwargs=dict(num=session.meeting.number))
+        url = urlreverse('ietf.meeting.views.agenda_ical', kwargs=dict(num=session.meeting.number))
         r = self.client.get(url)
         self.assertEqual(r.status_code,200)
         self.assertIn('STATUS:CANCELLED',unicontent(r))
@@ -2176,7 +2176,7 @@ class InterimTests(TestCase):
         s2 = SessionFactory.create(meeting=meeting, group=s1.group, add_to_schedule=False)
         SchedTimeSessAssignment.objects.create(timeslot=t2, session=s2, schedule=meeting.schedule)
         #
-        url = urlreverse('ietf.meeting.views.ical_agenda', kwargs={'num':meeting.number, 'acronym':s1.group.acronym, })
+        url = urlreverse('ietf.meeting.views.agenda_ical', kwargs={'num':meeting.number, 'acronym':s1.group.acronym, })
         r = self.client.get(url)
         self.assertEqual(r.get('Content-Type'), "text/calendar")
         self.assertContains(r, 'BEGIN:VEVENT')
@@ -2186,7 +2186,7 @@ class InterimTests(TestCase):
         self.assertContains(r, t2.time.strftime('%Y%m%dT%H%M%S'))
         self.assertContains(r, 'END:VEVENT')
         #
-        url = urlreverse('ietf.meeting.views.ical_agenda', kwargs={'num':meeting.number, 'session_id':s1.id, })
+        url = urlreverse('ietf.meeting.views.agenda_ical', kwargs={'num':meeting.number, 'session_id':s1.id, })
         r = self.client.get(url)
         self.assertEqual(r.get('Content-Type'), "text/calendar")
         self.assertContains(r, 'BEGIN:VEVENT')
@@ -2256,7 +2256,7 @@ class IphoneAppJsonTests(TestCase):
     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})
+        url = urlreverse('ietf.meeting.views.agenda_json',kwargs={'num':meeting.number})
         r = self.client.get(url)
         self.assertEqual(r.status_code,200)
         data = r.json()
@@ -2278,7 +2278,7 @@ class IphoneAppJsonTests(TestCase):
             room.x2 = random.randint(0,100)
             room.y2 = random.randint(0,100)
             room.save()
-        url = urlreverse('ietf.meeting.views.json_agenda',kwargs={'num':meeting.number})
+        url = urlreverse('ietf.meeting.views.agenda_json',kwargs={'num':meeting.number})
         r = self.client.get(url)
         self.assertEqual(r.status_code,200)
         data = r.json()

ietf/meeting/urls.py

@@ -19,8 +19,8 @@ safe_for_all_meeting_types = [
     url(r'^session/(?P<session_id>\d+)/remove_from_session$', views.ajax_remove_slides_from_session),
     url(r'^session/(?P<session_id>\d+)/reorder_in_session$', views.ajax_reorder_slides_in_session),
     url(r'^session/(?P<session_id>\d+)/doc/%(name)s/remove$' % settings.URL_REGEXPS, views.remove_sessionpresentation),
-    url(r'^session/(?P<session_id>\d+)\.ics$',    views.ical_agenda),
-    url(r'^sessions/(?P<acronym>[-a-z0-9]+)\.ics$', views.ical_agenda),
+    url(r'^session/(?P<session_id>\d+)\.ics$',    views.agenda_ical),
+    url(r'^sessions/(?P<acronym>[-a-z0-9]+)\.ics$', views.agenda_ical),
     url(r'^slidesubmission/(?P<slidesubmission_id>\d+)$', views.approve_proposed_slides)
 ]
 
@@ -71,7 +71,7 @@ type_interim_patterns = [
     url(r'^agenda/(?P<acronym>[A-Za-z0-9-]+)-drafts.pdf$', views.session_draft_pdf),
     url(r'^agenda/(?P<acronym>[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)
+    url(r'^agenda.json$', views.agenda_json)
 ]
 
 type_ietf_only_patterns_id_optional = [
@@ -81,9 +81,9 @@ type_ietf_only_patterns_id_optional = [
     url(r'^agenda/edit$', views.edit_schedule),
     url(r'^agenda/edit/$', views.edit_meeting_schedule),
     url(r'^requests$', views.meeting_requests),
-    url(r'^agenda/agenda\.ics$', views.ical_agenda),
-    url(r'^agenda\.ics$', views.ical_agenda),
-    url(r'^agenda.json$', views.json_agenda),
+    url(r'^agenda/agenda\.ics$', views.agenda_ical),
+    url(r'^agenda\.ics$', views.agenda_ical),
+    url(r'^agenda.json$', views.agenda_json),
     url(r'^agenda/week-view(?:.html)?/?$', views.week_view),
     url(r'^agenda/room-view(?:.html)?/?$', views.room_view),
     url(r'^floor-plan/?$', views.floor_plan),

ietf/meeting/views.py

@@ -1306,7 +1306,7 @@ def ical_session_status(session_with_current_status):
     else:
         return "CONFIRMED"
 
-def ical_agenda(request, num=None, name=None, acronym=None, session_id=None):
+def agenda_ical(request, num=None, name=None, acronym=None, session_id=None):
     meeting = get_meeting(num, type_in=None)
     schedule = get_schedule(meeting, name)
     updated = meeting.updated()
@@ -1363,7 +1363,7 @@ def ical_agenda(request, num=None, name=None, acronym=None, session_id=None):
     }, content_type="text/calendar")
 
 @cache_page(15 * 60)
-def json_agenda(request, num=None ):
+def agenda_json(request, num=None ):
     meeting = get_meeting(num, type_in=['ietf','interim'])
 
     sessions = []