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

Proposed by Chris Johnston on 2011-04-01
Status: Merged
Approved by: Michael Hall on 2011-04-02
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 2011-04-01 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
1=== modified file 'summit/schedule/context_processors.py'
2--- summit/schedule/context_processors.py 2010-08-30 14:30:29 +0000
3+++ summit/schedule/context_processors.py 2011-04-01 15:14:25 +0000
4@@ -2,3 +2,6 @@
5
6 def next_summit(request):
7 return {'next_summit': Summit.objects.next() }
8+
9+def login_redirect(request):
10+ return {'login_next': request.get_full_path()}
11
12=== modified file 'summit/settings.py'
13--- summit/settings.py 2011-03-15 19:28:59 +0000
14+++ summit/settings.py 2011-04-01 15:14:25 +0000
15@@ -84,6 +84,7 @@
16 "django.core.context_processors.media",
17 "django.core.context_processors.request",
18 "schedule.context_processors.next_summit",
19+ "schedule.context_processors.login_redirect",
20 )
21
22 MIDDLEWARE_CLASSES = (

Subscribers

People subscribed via source and target branches