diff --git a/ietf/meeting/helpers.py b/ietf/meeting/helpers.py index 24a697b17..bac9695b3 100644 --- a/ietf/meeting/helpers.py +++ b/ietf/meeting/helpers.py @@ -66,12 +66,7 @@ def build_all_agenda_slices(meeting): time_slices = [] date_slices = {} - #for ts in meeting.timeslot_set.exclude(type__in=['reg','break']).order_by('time','name'): - #for ts in meeting.timeslot_set.exclude(type__in=['reg','break','lead','offagenda','other']).order_by('time','name'): for ts in meeting.timeslot_set.filter(type__in=['session',]).order_by('time','name'): - #for ts in meeting.timeslot_set.exclude(type__in=['reg','break','other']).order_by('time','name'): - #for ts in meeting.timeslot_set.order_by('time','name'): - #for ts in meeting.timeslot_set.filter(type='offagenda').order_by('time','name'): ymd = ts.time.date() if ymd not in date_slices and ts.location != None: @@ -85,12 +80,6 @@ def build_all_agenda_slices(meeting): time_slices.sort() return time_slices,date_slices -# Not Used -#def get_scheduledsessions_from_schedule(schedule): -# ss = schedule.scheduledsession_set.filter(timeslot__location__isnull = False).exclude(session__isnull = True).order_by('timeslot__time','timeslot__name','session__group__group') -# -# return ss - def get_all_scheduledsessions_from_schedule(schedule): ss = schedule.scheduledsession_set.filter(timeslot__location__isnull = False) ss = ss.filter(session__type__slug='session') diff --git a/ietf/meeting/views.py b/ietf/meeting/views.py index a5c202599..5da690c45 100644 --- a/ietf/meeting/views.py +++ b/ietf/meeting/views.py @@ -259,8 +259,6 @@ def edit_agenda(request, num=None, owner=None, name=None): meeting_base_url = request.build_absolute_uri(meeting.base_url()) site_base_url = request.build_absolute_uri('/')[:-1] # skip the trailing slash - #rooms = meeting.room_set.order_by("capacity") - #rooms = rooms.all() rooms = meeting.room_set.filter(session_types__slug='session').distinct().order_by("capacity") saveas = SaveAsForm() saveasurl=reverse(edit_agenda,