projects
/
mediagoblin.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[to_email] rather than list(to_email) which makes a nasty series like ['e','m','a...
[mediagoblin.git]
/
mediagoblin
/
decorators.py
diff --git
a/mediagoblin/decorators.py
b/mediagoblin/decorators.py
index c6b4b545109b749ec69f5a6653684c593e3d64bf..1774ce4e71a38b632fa0cf0272aa2d89efb6b1ce 100644
(file)
--- a/
mediagoblin/decorators.py
+++ b/
mediagoblin/decorators.py
@@
-33,11
+33,13
@@
def require_active_login(controller):
Require an active login from the user.
"""
def new_controller_func(request, *args, **kwargs):
Require an active login from the user.
"""
def new_controller_func(request, *args, **kwargs):
- if not request.user or not request.user.get('s
ession') ==
'active':
+ if not request.user or not request.user.get('s
tatus') == u
'active':
# TODO: Indicate to the user that they were redirected
# here because an *active* user is required.
return exc.HTTPFound(
# TODO: Indicate to the user that they were redirected
# here because an *active* user is required.
return exc.HTTPFound(
- location=request.urlgen("mediagoblin.auth.login"))
+ location="%s?next=%s" % (
+ request.urlgen("mediagoblin.auth.login"),
+ request.path_info))
return controller(request, *args, **kwargs)
return controller(request, *args, **kwargs)