Skip to content

Commit 3d5862a

Browse files
committed
Changed get_timeslot_for_filename() to not blow up in the presence of duplicate timeslots.
- Legacy-Id: 13952
1 parent 60bfe4d commit 3d5862a

1 file changed

Lines changed: 5 additions & 2 deletions

File tree

ietf/secr/proceedings/proc_utils.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,10 +142,13 @@ def get_timeslot_for_filename(filename):
142142
meeting = Meeting.objects.get(number=match.groupdict()['number'])
143143
room_mapping = {normalize_room_name(room.name): room.name for room in meeting.room_set.all()}
144144
time = datetime.datetime.strptime(match.groupdict()['time'],'%Y%m%d-%H%M')
145-
return TimeSlot.objects.get(
145+
slots = TimeSlot.objects.filter(
146146
meeting=meeting,
147147
location__name=room_mapping[match.groupdict()['room']],
148-
time=time)
148+
time=time,
149+
sessionassignments__schedule=meeting.agenda,
150+
).distinct()
151+
return slots.get()
149152
except (ObjectDoesNotExist, KeyError):
150153
return None
151154

0 commit comments

Comments
 (0)