diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-05-31 19:17:28 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-05-31 19:17:28 -0500 |
| commit | d9951a6e03686e41479b83bc022eb97945efeca9 (patch) | |
| tree | 4641261de1e623650e8f4b784708c197240a70b3 /mediagoblin/decorators.py | |
| parent | b1ae76aea0141354b479e1c0451bc003e9b6e248 (diff) | |
| parent | b93a6a229e1c7a7eef76e8322104912378f79a96 (diff) | |
| download | mediagoblin-d9951a6e03686e41479b83bc022eb97945efeca9.tar.lz mediagoblin-d9951a6e03686e41479b83bc022eb97945efeca9.tar.xz mediagoblin-d9951a6e03686e41479b83bc022eb97945efeca9.zip | |
Merge remote branch 'remotes/aleks/aleks'
Diffstat (limited to 'mediagoblin/decorators.py')
| -rw-r--r-- | mediagoblin/decorators.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mediagoblin/decorators.py b/mediagoblin/decorators.py index ff3f0b5e..bc12d61c 100644 --- a/mediagoblin/decorators.py +++ b/mediagoblin/decorators.py @@ -36,9 +36,10 @@ def require_active_login(controller): Require an active login from the user. """ def new_controller_func(request, *args, **kwargs): - if not request.user or not request.user.get('status') == u'active': - # TODO: Indicate to the user that they were redirected - # here because an *active* user is required. + if request.user and request.user.get('status') == u'needs_email_verification': + return exc.HTTPFound( + location = request.urlgen('mediagoblin.auth.verify_email_notice')) + elif not request.user or request.user.get('status') != u'active': return exc.HTTPFound( location="%s?next=%s" % ( request.urlgen("mediagoblin.auth.login"), |