Skip to content

Commit 092e8a6

Browse files
committed
Merged in [19182] from rjsparks@nostrum.com:
Stop showing generated proceedings for older meetings that already had official proceedings. Fixes ietf-tools#3322. - Legacy-Id: 19184 Note: SVN reference [19182] has been migrated to Git commit 3202a25
2 parents 9621eaf + 3202a25 commit 092e8a6

3 files changed

Lines changed: 2 additions & 8 deletions

File tree

ietf/meeting/tests_views.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -541,7 +541,7 @@ def test_materials_name_endswith_hyphen_number_number(self):
541541
self.assertEqual(r.status_code, 200)
542542

543543
def test_proceedings(self):
544-
meeting = make_meeting_test_data()
544+
meeting = make_meeting_test_data(meeting=MeetingFactory(type_id='ietf', number='100'))
545545
session = Session.objects.filter(meeting=meeting, group__acronym="mars").first()
546546
GroupEventFactory(group=session.group,type='status_update')
547547
SessionPresentationFactory(document__type_id='recording',session=session)

ietf/meeting/views.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3682,7 +3682,7 @@ def proceedings(request, num=None):
36823682

36833683
meeting = get_meeting(num)
36843684

3685-
if (meeting.number.isdigit() and int(meeting.number) <= 64):
3685+
if (meeting.number.isdigit() and int(meeting.number) <= 96):
36863686
return HttpResponseRedirect( 'https://www.ietf.org/proceedings/%s' % num )
36873687

36883688
if not meeting.schedule or not meeting.schedule.assignments.exists():

ietf/templates/meeting/proceedings.html

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,6 @@ <h1>IETF {{ meeting.number }} {% if not meeting.proceedings_final %}Draft{% endi
2323
{% endif %}
2424
</h1>
2525

26-
{% if meeting.number|add:0 <= 96 %}
27-
<p class="alert alert-info">
28-
<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>
29-
</p>
30-
{% endif %}
31-
3226
{# cache for 15 minutes, as long as there's no proceedings activity. takes 4-8 seconds to generate. #}
3327
{% load cache %}
3428
{% cache 900 ietf_meeting_proceedings meeting.number cache_version %}

0 commit comments

Comments
 (0)