Reverted the changes in [14254] and [14255]

- Legacy-Id: 14274
Note: SVN reference [14254] has been migrated to Git commit cf6143cce7

Note: SVN reference [14255] has been migrated to Git commit d4cc828e27

ietf/meeting/tests_views.py

@@ -119,7 +119,9 @@ class MeetingTests(TestCase):
 
         # future meeting, no agenda
         r = self.client.get(urlreverse("ietf.meeting.views.agenda", kwargs=dict(num=future_meeting.number)))
-        self.assertEqual(r.status_code, 404)
+        self.assertEqual(r.status_code, 200)
+        self.assertContains(r, u"There is no agenda available yet.")
+        self.assertTemplateUsed(r, 'meeting/no-agenda.html')
 
         # text
         # the rest of the results don't have as nicely formatted times
@@ -141,7 +143,9 @@ class MeetingTests(TestCase):
 
         # future meeting, no agenda
         r = self.client.get(urlreverse("ietf.meeting.views.agenda", kwargs=dict(num=future_meeting.number, ext=".txt")))
-        self.assertEqual(r.status_code, 404)
+        self.assertEqual(r.status_code, 200)
+        self.assertContains(r, "There is no agenda available yet.")
+        self.assertTemplateUsed(r, 'meeting/no-agenda.txt')
 
         # CSV
         r = self.client.get(urlreverse("ietf.meeting.views.agenda", kwargs=dict(num=meeting.number, ext=".csv")))

ietf/meeting/views.py

@@ -445,10 +445,7 @@ def agenda(request, num=None, name=None, base=None, ext=None, owner=None, utc=""
     
     assert num is None or num.isdigit()
 
-    current = get_ietf_meeting()
     meeting = get_ietf_meeting(num)
-    if int(meeting.number) > int(current.number):
-        raise Http404("Meeting too far in the future")
     if not meeting or (meeting.number.isdigit() and int(meeting.number) <= 64 and not meeting.agenda.assignments.exists()):
         if ext == '.html':
             return HttpResponseRedirect( 'https://www.ietf.org/proceedings/%s' % num )