Removed some unreachable code.
- Legacy-Id: 14150
This commit is contained in:
Henrik Levkowetz
parent
0e00adc5ee
commit
cbda2679a9
|
|
@ -195,29 +195,6 @@ def close_open_ballots(doc, by):
|
|||
for t in BallotType.objects.filter(doc_type=doc.type_id):
|
||||
close_ballot(doc, by, t.slug )
|
||||
|
||||
def augment_with_start_time(docs):
|
||||
"""Add a started_time attribute to each document with the time of
|
||||
the first revision."""
|
||||
from ietf.utils import log
|
||||
log.unreachable("2017-07-08")
|
||||
docs = list(docs)
|
||||
|
||||
docs_dict = {}
|
||||
for d in docs:
|
||||
docs_dict[d.pk] = d
|
||||
d.start_time = None
|
||||
|
||||
seen = set()
|
||||
|
||||
for e in DocEvent.objects.filter(type="new_revision", doc__in=docs).order_by('time'):
|
||||
if e.doc_id in seen:
|
||||
continue
|
||||
|
||||
docs_dict[e.doc_id].start_time = e.time
|
||||
seen.add(e.doc_id)
|
||||
|
||||
return docs
|
||||
|
||||
def get_chartering_type(doc):
|
||||
chartering = ""
|
||||
if doc.get_state_slug() not in ("notrev", "approved"):
|
||||
|
|
|
|||
|
|
@ -281,18 +281,6 @@ class Role(models.Model):
|
|||
def __unicode__(self):
|
||||
return u"%s is %s in %s" % (self.person.plain_name(), self.name.name, self.group.acronym or self.group.name)
|
||||
|
||||
def name_and_email(self):
|
||||
"""
|
||||
Returns name and email, e.g.: u'Ano Nymous <ano@nymous.org>'
|
||||
Is intended for display use, not in email context.
|
||||
Use self.formatted_email() for that.
|
||||
"""
|
||||
log.unreachable("2017-06-06")
|
||||
if self.person:
|
||||
return u"%s <%s>" % (self.person.plain_name(), self.email.address)
|
||||
else:
|
||||
return u"<%s>" % self.address
|
||||
|
||||
def formatted_ascii_email(self):
|
||||
return email.utils.formataddr((self.person.plain_ascii(), self.email.address))
|
||||
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ from collections import OrderedDict, Counter
|
|||
import csv
|
||||
import json
|
||||
import pytz
|
||||
from pyquery import PyQuery
|
||||
|
||||
from wsgiref.handlers import format_date_time
|
||||
from calendar import timegm
|
||||
|
||||
|
|
@ -47,7 +47,7 @@ from ietf.meeting.helpers import get_all_assignments_from_schedule
|
|||
from ietf.meeting.helpers import get_modified_from_assignments
|
||||
from ietf.meeting.helpers import get_wg_list, find_ads_for_meeting
|
||||
from ietf.meeting.helpers import get_meeting, get_schedule, agenda_permissions, get_ietf_meeting
|
||||
from ietf.meeting.helpers import preprocess_assignments_for_agenda, read_agenda_file, read_session_file
|
||||
from ietf.meeting.helpers import preprocess_assignments_for_agenda, read_agenda_file
|
||||
from ietf.meeting.helpers import convert_draft_to_pdf, get_earliest_session_date
|
||||
from ietf.meeting.helpers import can_view_interim_request, can_approve_interim_request
|
||||
from ietf.meeting.helpers import can_edit_interim_request
|
||||
|
|
@ -60,7 +60,6 @@ from ietf.meeting.utils import finalize
|
|||
from ietf.secr.proceedings.utils import handle_upload_file
|
||||
from ietf.secr.proceedings.proc_utils import (get_progress_stats, post_process, import_audio_files,
|
||||
import_youtube_video_urls)
|
||||
from ietf.utils import log
|
||||
from ietf.utils.mail import send_mail_message
|
||||
from ietf.utils.pipe import pipe
|
||||
from ietf.utils.pdf import pdf_pages
|
||||
|
|
@ -623,55 +622,6 @@ def agenda_by_type_ics(request,num=None,type=None):
|
|||
updated = meeting.updated()
|
||||
return render(request,"meeting/agenda.ics",{"schedule":schedule,"updated":updated,"assignments":assignments},content_type="text/calendar")
|
||||
|
||||
def session_document(request, num, acronym, type="agenda"):
|
||||
log.unreachable("2017-07-22")
|
||||
d = Document.objects.filter(type=type, session__meeting__number=num)
|
||||
if acronym == "plenaryt":
|
||||
d = d.filter(session__name__icontains="technical", session__slots__type="plenary")
|
||||
elif acronym == "plenaryw":
|
||||
d = d.filter(session__name__icontains="admin", session__slots__type="plenary")
|
||||
else:
|
||||
d = d.filter(session__group__acronym=acronym)
|
||||
|
||||
if d:
|
||||
doc = d[0]
|
||||
html5_preamble = "<!doctype html><html lang=en><head><meta charset=utf-8><title>%s</title></head><body>"
|
||||
html5_postamble = "</body></html>"
|
||||
content, path = read_session_file(type, num, doc)
|
||||
_, ext = os.path.splitext(path)
|
||||
ext = ext.lstrip(".").lower()
|
||||
|
||||
if not content:
|
||||
content = "Could not read %s file '%s'" % (type, path)
|
||||
return HttpResponse(content, content_type="text/plain; charset=%s"%settings.DEFAULT_CHARSET)
|
||||
|
||||
if ext == "txt":
|
||||
return HttpResponse(content, content_type="text/plain; charset=%s"%settings.DEFAULT_CHARSET)
|
||||
elif ext == "pdf":
|
||||
return HttpResponse(content, content_type="application/pdf")
|
||||
elif ext in ["html", "htm"]:
|
||||
content=re.sub("(\r\n|\r)", "\n", content)
|
||||
d = PyQuery(content)
|
||||
d("head title").empty()
|
||||
d("head title").append(str(doc))
|
||||
d('meta[http-equiv]').remove()
|
||||
content = "<!doctype html>" + str(d)
|
||||
else:
|
||||
content = "<p>Unrecognized %s file '%s'</p>" % (type, doc.external_url)
|
||||
content = (html5_preamble % doc) + content + html5_postamble
|
||||
|
||||
return HttpResponse(content)
|
||||
|
||||
raise Http404("No %s for the %s session of IETF %s is available" % (type, acronym, num))
|
||||
|
||||
def session_agenda(request, num, session):
|
||||
log.unreachable("2017-07-22")
|
||||
return session_document(request, num, acronym=session, type='agenda')
|
||||
|
||||
def session_minutes(request, num, session):
|
||||
log.unreachable("2017-07-22")
|
||||
return session_document(request, num, acronym=session, type='minutes')
|
||||
|
||||
def session_draft_list(num, session):
|
||||
try:
|
||||
agendas = Document.objects.filter(type="agenda",
|
||||
|
|
|
|||
|
|
@ -233,31 +233,6 @@ def send_notifications(meeting, groups, person):
|
|||
GroupEvent.objects.create(group=group,time=now,type='sent_notification',
|
||||
by=person,desc='sent scheduled notification for %s' % meeting)
|
||||
|
||||
def sort_groups(meeting,schedule=None):
|
||||
'''
|
||||
Similar to sreq.views.sort_groups
|
||||
Takes a Meeting object and returns a tuple scheduled_groups, unscheduled groups.
|
||||
'''
|
||||
from ietf.utils import log
|
||||
log.unreachable("2017-07-08")
|
||||
if not schedule:
|
||||
schedule = meeting.agenda
|
||||
scheduled_groups = []
|
||||
unscheduled_groups = []
|
||||
#sessions = Session.objects.filter(meeting=meeting,status__in=('schedw','apprw','appr','sched','notmeet','canceled'))
|
||||
sessions = Session.objects.filter(meeting=meeting,status__in=('schedw','apprw','appr','sched','canceled'))
|
||||
groups_with_sessions = [ s.group for s in sessions ]
|
||||
gset = set(groups_with_sessions)
|
||||
sorted_groups_with_sessions = sorted(gset, key = lambda instance: instance.acronym)
|
||||
scheduled_sessions = SchedTimeSessAssignment.objects.filter(schedule=schedule,session__isnull=False)
|
||||
groups_with_timeslots = [ x.session.group for x in scheduled_sessions ]
|
||||
for group in sorted_groups_with_sessions:
|
||||
if group in groups_with_timeslots:
|
||||
scheduled_groups.append(group)
|
||||
else:
|
||||
unscheduled_groups.append(group)
|
||||
|
||||
return scheduled_groups, unscheduled_groups
|
||||
|
||||
# -------------------------------------------------
|
||||
# AJAX Functions
|
||||
|
|
|
|||
Loading…
Reference in a new issue