Merged in [19182] from rjsparks@nostrum.com:
Stop showing generated proceedings for older meetings that already had official proceedings. Fixes #3322.
- Legacy-Id: 19184
Note: SVN reference [19182] has been migrated to Git commit 3202a25c52
This commit is contained in:
commit
092e8a6e5d
|
@ -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)
|
||||
|
|
|
@ -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():
|
||||
|
|
|
@ -23,12 +23,6 @@
|
|||
{% endif %}
|
||||
</h1>
|
||||
|
||||
{% if meeting.number|add:0 <= 96 %}
|
||||
<p class="alert alert-info">
|
||||
<b>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 <a href="https://www.ietf.org/proceedings/{{meeting.number}}">https://www.ietf.org/proceedings/{{meeting.number}}</a></b>
|
||||
</p>
|
||||
{% 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 %}
|
||||
|
|
Loading…
Reference in a new issue