altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 2 Packages Projects Releases Wiki Activity

Reinstated the release 4.72 get_agenda_info() as legacy_get_agenda_info(),

Browse source 
and tweaked it to work with the new Timeslot model's sessions field.
Reverted the html agenda view code to use legacy_get_agenda_info(), based
on the release 4.72 code.  This is a fix to display the html agenda for
now, and will need more cleanup, but this should be done without introducing
scheduledsession instances to the template.
 - Legacy-Id: 6437
This commit is contained in:
Henrik Levkowetz 2013-10-13 17:59:42 +00:00
parent 9be2f712b8
commit e516dc7925
1 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
ietf/meeting/views.py
View file

@ -113,6 +113,21 @@ def agenda_html_request(request,num=None, schedule_name=None):
# GET and HEAD.
return html_agenda(request, num, schedule_name)
def legacy_get_agenda_info(request, num=None, schedule=None):
meeting = get_meeting(num)
timeslots = TimeSlot.objects.filter(Q(meeting__id = meeting.id)).exclude(type__slug='unavail').order_by('time','name')
modified = timeslots.aggregate(Max('modified'))['modified__max']
area_list = list(set([ session.group.parent.acronym for session in [ timeslot.session for timeslot in timeslots.filter(type = 'Session', sessions__group__parent__isnull = False, scheduledsession__schedule=schedule).order_by('sessions__group__parent__acronym').distinct() if timeslot.session ] ]))
area_list.sort()
# wg_name_list = timeslots.filter(type = 'Session', sessions__group__isnull = False, sessions__group__parent__isnull = False, scheduledsession__schedule=schedule).order_by('sessions__group__acronym').distinct('sessions__group')#.values_list('sessions__group__acronym',flat=True)
wg_name_list = list(set([ session.group.acronym for session in [ timeslot.session for timeslot in timeslots.filter(type = 'Session', sessions__group__parent__isnull = False, scheduledsession__schedule=schedule).order_by('sessions__group__acronym').distinct() if timeslot.session ] ]))
wg_list = Group.objects.filter(acronym__in = set(wg_name_list)).order_by('parent__acronym','acronym')
return timeslots, modified, meeting, area_list, wg_list
def get_agenda_info(request, num=None, schedule_name=None):
meeting = get_meeting(num)
schedule = get_schedule(meeting, schedule_name)
@ -143,26 +158,19 @@ def html_agenda_1(request, num, schedule_name, template_version="meeting/agenda.
if "iPhone" in user_agent:
return iphone_agenda(request, num, schedule_name)
scheduledsessions, schedule, modified, meeting, area_list, wg_list, time_slices, date_slices, rooms = get_agenda_info(request, num, schedule_name)
areas = get_areas()
meeting = get_meeting(num)
schedule = get_schedule(meeting, schedule_name)
timeslots, modified, meeting, area_list, wg_list = legacy_get_agenda_info(request, num, schedule)
return HttpResponse(render_to_string(template_version,
{"scheduledsessions":scheduledsessions,
"rooms":rooms,
"areas":areas,
"time_slices":time_slices,
"date_slices":date_slices,
"modified": modified, "meeting":meeting,
"area_list": area_list, "wg_list": wg_list,
"fg_group_colors": fg_group_colors,
"bg_group_colors": bg_group_colors,
{"timeslots":timeslots, "modified": modified, "meeting":meeting,
"area_list": area_list, "wg_list": wg_list ,
"show_inline": set(["txt","htm","html"]) },
RequestContext(request)), mimetype="text/html")
def html_agenda(request, num=None, schedule_name=None):
return html_agenda_1(request, num, schedule_name, "meeting/agenda.html")
@decorator_from_middleware(GZipMiddleware)
def html_agenda_utc(request, num=None, schedule_name=None):
return html_agenda_1(request, num, schedule_name, "meeting/agenda_utc.html")