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
=== modified file 'summit/schedule/render.py'
--- summit/schedule/render.py 2010-09-22 20:54:45 +0000
+++ summit/schedule/render.py 2010-09-22 20:54:45 +0000
@@ -891,3 +891,13 @@
891 csv += "\n"891 csv += "\n"
892892
893 return csv893 return csv
894
895
896class LinaroSchedule(Schedule):
897
898 def meeting_div(self, meeting, room=None, slot=None, pos=None):
899 if meeting.is_linaro:
900 return super(LinaroSchedule, self).meeting_div(
901 meeting, room=room, slot=slot, pos=pos)
902 else:
903 return u''
894904
=== modified file 'summit/schedule/views.py'
--- summit/schedule/views.py 2010-09-21 01:32:07 +0000
+++ summit/schedule/views.py 2010-09-22 20:54:45 +0000
@@ -29,7 +29,7 @@
2929
30from summit.schedule.forms import AttendeeInterestForm30from summit.schedule.forms import AttendeeInterestForm
3131
32from summit.schedule.render import Schedule32from summit.schedule.render import LinaroSchedule, Schedule
3333
34__all__ = (34__all__ = (
35 'index',35 'index',
@@ -84,7 +84,10 @@
8484
85@summit_required85@summit_required
86def by_date(request, summit, attendee, date):86def by_date(request, summit, attendee, date):
87 schedule = Schedule(request, summit, attendee, date=date)87 if 'linaro_only' in request.GET:
88 schedule = LinaroSchedule(request, summit, attendee, date=date)
89 else:
90 schedule = Schedule(request, summit, attendee, date=date)
8891
89 if request.method == 'POST':92 if request.method == 'POST':
90 return schedule.save_change()93 return schedule.save_change()

Subscribers

People subscribed via source and target branches