Skip to content

Commit 7d244c9

Browse files
committed
Remove legacy external interim meeting listing. Install redirect to /meeting/past. Fixes ietf-tools#2166. Commit ready for merge.
- Legacy-Id: 13727
1 parent a251076 commit 7d244c9

2 files changed

Lines changed: 0 additions & 31 deletions

File tree

ietf/secr/proceedings/proc_utils.py

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,11 @@
1515
from apiclient.discovery import build
1616
from django.conf import settings
1717
from django.core.exceptions import ObjectDoesNotExist
18-
from django.http import HttpRequest
19-
from django.shortcuts import render
2018

2119
from ietf.doc.models import Document, DocAlias, DocEvent, NewRevisionDocEvent, State
2220
from ietf.group.models import Group
2321
from ietf.meeting.models import Meeting, SessionPresentation, TimeSlot, SchedTimeSessAssignment
2422
from ietf.person.models import Person
25-
from ietf.secr.proceedings.models import InterimMeeting # proxy model
2623
from ietf.utils.log import log
2724
from ietf.utils.mail import send_mail
2825

@@ -304,31 +301,6 @@ def get_progress_stats(sdate,edate):
304301

305302
return data
306303

307-
def create_interim_directory():
308-
'''
309-
Create static Interim Meeting directory pages that will live in a different URL space than
310-
the secretariat Django project
311-
'''
312-
313-
# produce date sorted output
314-
page = 'proceedings.html'
315-
meetings = InterimMeeting.objects.filter(session__status='sched').order_by('-date')
316-
response = render(HttpRequest(), 'proceedings/interim_directory.html',{'meetings': meetings})
317-
path = os.path.join(settings.SECR_INTERIM_LISTING_DIR, page)
318-
f = open(path,'w')
319-
f.write(response.content)
320-
f.close()
321-
322-
# produce group sorted output
323-
page = 'proceedings-bygroup.html'
324-
qs = InterimMeeting.objects.filter(session__status='sched')
325-
meetings = sorted(qs, key=lambda a: a.group().acronym)
326-
response = render(HttpRequest(), 'proceedings/interim_directory.html',{'meetings': meetings})
327-
path = os.path.join(settings.SECR_INTERIM_LISTING_DIR, page)
328-
f = open(path,'w')
329-
f.write(response.content)
330-
f.close()
331-
332304
def is_powerpoint(doc):
333305
'''
334306
Returns true if document is a Powerpoint presentation

ietf/secr/rolodex/tests.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,9 @@ def test_edit_replace_user(self):
4848
'email-MAX_NUM_FORMS':1000,
4949
'submit': 'Submit',
5050
}
51-
#print person.user
52-
#self.assertTrue(False)
5351
original_user = person.user
5452
person_id = person.pk
5553
response = self.client.post(url, post_data, follow=True)
56-
print response.content
5754
person = Person.objects.get(id=person_id)
5855
original_user = User.objects.get(id=original_user.id)
5956
self.assertRedirects(response, redirect_url)

0 commit comments

Comments
 (0)