Merge lp:~cjohnston/summit/747419 into lp:summit

Proposed by Chris Johnston
Status: Merged
Approved by: Michael Hall
Approved revision: 70
Merged at revision: 72
Proposed branch: lp:~cjohnston/summit/747419
Merge into: lp:summit
Diff against target: 22 lines (+4/-0)
2 files modified
summit/schedule/context_processors.py (+3/-0)
summit/settings.py (+1/-0)
To merge this branch: bzr merge lp:~cjohnston/summit/747419
Reviewer Review Type Date Requested Status
Summit Hackers Pending
Review via email: mp+55948@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'summit/schedule/context_processors.py'
--- summit/schedule/context_processors.py 2010-08-30 14:30:29 +0000
+++ summit/schedule/context_processors.py 2011-04-01 15:14:25 +0000
@@ -2,3 +2,6 @@
22
3def next_summit(request):3def next_summit(request):
4 return {'next_summit': Summit.objects.next() }4 return {'next_summit': Summit.objects.next() }
5
6def login_redirect(request):
7 return {'login_next': request.get_full_path()}
58
=== modified file 'summit/settings.py'
--- summit/settings.py 2011-03-15 19:28:59 +0000
+++ summit/settings.py 2011-04-01 15:14:25 +0000
@@ -84,6 +84,7 @@
84 "django.core.context_processors.media",84 "django.core.context_processors.media",
85 "django.core.context_processors.request",85 "django.core.context_processors.request",
86 "schedule.context_processors.next_summit",86 "schedule.context_processors.next_summit",
87 "schedule.context_processors.login_redirect",
87)88)
8889
89MIDDLEWARE_CLASSES = (90MIDDLEWARE_CLASSES = (

Subscribers

People subscribed via source and target branches