From 3202a25c526eb912ca8a779a8f24e457f007a3e0 Mon Sep 17 00:00:00 2001 From: Robert Sparks Date: Thu, 1 Jul 2021 22:45:04 +0000 Subject: [PATCH] Stop showing generated proceedings for older meetings that already had official proceedings. Fixes #3322. Commit ready for merge. - Legacy-Id: 19182 --- ietf/meeting/tests_views.py | 2 +- ietf/meeting/views.py | 2 +- ietf/templates/meeting/proceedings.html | 6 ------ 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/ietf/meeting/tests_views.py b/ietf/meeting/tests_views.py index 85aa9dd31..04fa28dde 100644 --- a/ietf/meeting/tests_views.py +++ b/ietf/meeting/tests_views.py @@ -541,7 +541,7 @@ class MeetingTests(TestCase): self.assertEqual(r.status_code, 200) def test_proceedings(self): - meeting = make_meeting_test_data() + meeting = make_meeting_test_data(meeting=MeetingFactory(type_id='ietf', number='100')) session = Session.objects.filter(meeting=meeting, group__acronym="mars").first() GroupEventFactory(group=session.group,type='status_update') SessionPresentationFactory(document__type_id='recording',session=session) diff --git a/ietf/meeting/views.py b/ietf/meeting/views.py index 57dabc3d4..4e1d3d9cd 100644 --- a/ietf/meeting/views.py +++ b/ietf/meeting/views.py @@ -3682,7 +3682,7 @@ def proceedings(request, num=None): meeting = get_meeting(num) - if (meeting.number.isdigit() and int(meeting.number) <= 64): + if (meeting.number.isdigit() and int(meeting.number) <= 96): return HttpResponseRedirect( 'https://www.ietf.org/proceedings/%s' % num ) if not meeting.schedule or not meeting.schedule.assignments.exists(): diff --git a/ietf/templates/meeting/proceedings.html b/ietf/templates/meeting/proceedings.html index dee9923f2..013fe923e 100644 --- a/ietf/templates/meeting/proceedings.html +++ b/ietf/templates/meeting/proceedings.html @@ -23,12 +23,6 @@ {% endif %} - {% if meeting.number|add:0 <= 96 %} -

- These are not the official proceedings for IETF{{meeting.number}}. This page shows what would be generated by the new automatic proceedings generator for that meeting. The official proceedings are located at https://www.ietf.org/proceedings/{{meeting.number}} -

- {% endif %} - {# cache for 15 minutes, as long as there's no proceedings activity. takes 4-8 seconds to generate. #} {% load cache %} {% cache 900 ietf_meeting_proceedings meeting.number cache_version %}