Merge lp:~mhall119/summit/fixes-647131 into lp:summit

Proposed by Michael Hall
Status: Merged
Approved by: Chris Johnston
Approved revision: 149
Merged at revision: 157
Proposed branch: lp:~mhall119/summit/fixes-647131
Merge into: lp:summit
Diff against target: 24 lines (+5/-4)
1 file modified
summit/schedule/render.py (+5/-4)
To merge this branch: bzr merge lp:~mhall119/summit/fixes-647131
Reviewer Review Type Date Requested Status
Chris Johnston Approve
Review via email: mp+73882@code.launchpad.net

Commit message

Check that at least one plenary room exists before trying to use it

Description of the change

Overview
========
Viewing the schedule without a plenary room throws an error.

Details
=======
Part of the schedule display code attempts to force plenary slots into plenary rooms only, but this throws an error if no plenary room has been defined. This fix keeps plenary slots off the schedule until a plenary room is defined.

To post a comment you must log in.
Revision history for this message
Chris Johnston (cjohnston) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'summit/schedule/render.py'
2--- summit/schedule/render.py 2011-07-22 01:34:00 +0000
3+++ summit/schedule/render.py 2011-09-02 20:02:30 +0000
4@@ -170,15 +170,16 @@
5 rooms = [r for r
6 in self.summit.room_set.filter(type__exact='plenary')
7 if r.available(slot)]
8-
9- self.meetings[slot].append((rooms[0], None))
10- meeting_room = rooms[0]
11+ if len(rooms) > 0:
12+ self.meetings[slot].append((rooms[0], None))
13+ meeting_room = rooms[0]
14 except KeyError:
15 if not self.track:
16 self.meetings[slot].append((None, None))
17 elif slot.type in ('break', 'lunch'):
18 rooms = [r for r in self.summit.room_set.all() if r.available(slot)]
19- self.meetings[slot].append((rooms[0], None))
20+ if len(rooms) > 0:
21+ self.meetings[slot].append((rooms[0], None))
22 else:
23 for room in self.rooms:
24 try:

Subscribers

People subscribed via source and target branches