Summit

Merge lp:~salgado/summit/include-plenaries-in-linaro-schedule into lp:summit

  1. include-plenaries-in-linaro-schedule
  2. Merge into trunk
Proposed by Guilherme Salgado
Status: Merged
Merged at revision: 40
Proposed branch: lp:~salgado/summit/include-plenaries-in-linaro-schedule
Merge into: lp:summit
Diff against target: 12 lines (+1/-1)
1 file modified
summit/schedule/render.py (+1/-1)
To merge this branch: bzr merge lp:~salgado/summit/include-plenaries-in-linaro-schedule
Reviewer Review Type Date Requested Status
Dave Walker (community) Approve
Review via email: mp+37626@code.launchpad.net

Description of the change

Make LinaroSchedule include the plenary sessions as well as the linaro sessions.

This is so that when the daily schedule page includes the plenaries when it is passed the linaro_only switch

To post a comment you must log in.
Revision history for this message
Dave Walker (davewalker) :
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 2010-10-03 22:22:30 +0000
3+++ summit/schedule/render.py 2010-10-05 15:44:45 +0000
4@@ -904,7 +904,7 @@
5 class LinaroSchedule(Schedule):
6
7 def meeting_div(self, meeting, room=None, slot=None, pos=None):
8- if meeting.is_linaro:
9+ if meeting.is_linaro or meeting.type in ('talk', 'plenary'):
10 return super(LinaroSchedule, self).meeting_div(
11 meeting, room=room, slot=slot, pos=pos)
12 else:

Subscribers

People subscribed via source and target branches