Skip to content

Commit 8972ef7

Browse files
committed
Fix from Adam with a tweak from Henrik for empty .ics files
- Legacy-Id: 4337
1 parent 6b86c81 commit 8972ef7

1 file changed

Lines changed: 10 additions & 8 deletions

File tree

ietf/meeting/views.py

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -494,20 +494,22 @@ def ical_agenda(request, num=None):
494494

495495
# Process the special flags.
496496
for item in include:
497-
if item[0] == '-':
498-
exclude.append(item[1:])
499-
if item[0] == '~':
500-
include_types.append(item[1:2].upper()+item[2:])
497+
if item:
498+
if item[0] == '-':
499+
exclude.append(item[1:])
500+
if item[0] == '~':
501+
include_types.append(item[1:2].upper()+item[2:])
501502

502503
timeslots = TimeSlot.objects.filter(Q(meeting = meeting.number),
503504
Q(type__name__in = include_types) |
504505
Q(session__group__acronym__in = filter) |
505506
Q(session__group__parent__acronym__in = filter)
506-
).exclude(Q(session__group__isnull = False),
507-
Q(session__group__acronym__in = exclude) |
508-
Q(session__group__parent__acronym__in = exclude))
507+
)#.exclude(Q(session__group__isnull = False),
508+
#Q(session__group__acronym__in = exclude) |
509+
#Q(session__group__parent__acronym__in = exclude))
509510

510-
return HttpResponse(render_to_string("meeting/agendaREDESIGN.ics" if settings.USE_DB_REDESIGN_PROXY_CLASSES else "meeting/agenda.ics",
511+
# return HttpResponse(render_to_string("meeting/agendaREDESIGN.ics" if settings.USE_DB_REDESIGN_PROXY_CLASSES else "meeting/agenda.ics",
512+
return HttpResponse(render_to_string("meeting/agendaREDESIGN.ics",
511513
{"timeslots":timeslots, "meeting":meeting },
512514
RequestContext(request)), mimetype="text/calendar")
513515

0 commit comments

Comments
 (0)