Merge lp:~salgado/summit/linaro-only-daily-schedule into lp:summit

Proposed by Guilherme Salgado
Status: Merged
Merged at revision: 29
Proposed branch: lp:~salgado/summit/linaro-only-daily-schedule
Merge into: lp:summit
Prerequisite: lp:~salgado/summit/highlight-linaro-sessions
Diff against target: 42 lines (+15/-2)
2 files modified
summit/schedule/render.py (+10/-0)
summit/schedule/views.py (+5/-2)
To merge this branch: bzr merge lp:~salgado/summit/linaro-only-daily-schedule
Reviewer Review Type Date Requested Status
Dave Walker (community) Approve
Review via email: mp+36384@code.launchpad.net

Description of the change

This branch makes it possible to have a daily schedule view which only shows the linaro sessions. To do that one just has to append a ?linaro_only to the URL (e.g. http://127.0.0.1:8000/uds-n/2010-09-23/?linaro_only)

To post a comment you must log in.
Revision history for this message
Dave Walker (davewalker) wrote :

I have tested this and the code looks good.. Merging, thanks :)

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-09-22 20:54:45 +0000
3+++ summit/schedule/render.py 2010-09-22 20:54:45 +0000
4@@ -891,3 +891,13 @@
5 csv += "\n"
6
7 return csv
8+
9+
10+class LinaroSchedule(Schedule):
11+
12+ def meeting_div(self, meeting, room=None, slot=None, pos=None):
13+ if meeting.is_linaro:
14+ return super(LinaroSchedule, self).meeting_div(
15+ meeting, room=room, slot=slot, pos=pos)
16+ else:
17+ return u''
18
19=== modified file 'summit/schedule/views.py'
20--- summit/schedule/views.py 2010-09-21 01:32:07 +0000
21+++ summit/schedule/views.py 2010-09-22 20:54:45 +0000
22@@ -29,7 +29,7 @@
23
24 from summit.schedule.forms import AttendeeInterestForm
25
26-from summit.schedule.render import Schedule
27+from summit.schedule.render import LinaroSchedule, Schedule
28
29 __all__ = (
30 'index',
31@@ -84,7 +84,10 @@
32
33 @summit_required
34 def by_date(request, summit, attendee, date):
35- schedule = Schedule(request, summit, attendee, date=date)
36+ if 'linaro_only' in request.GET:
37+ schedule = LinaroSchedule(request, summit, attendee, date=date)
38+ else:
39+ schedule = Schedule(request, summit, attendee, date=date)
40
41 if request.method == 'POST':
42 return schedule.save_change()

Subscribers

People subscribed via source and target branches