diff options
| author | Jef van Schendel <jefvanschendel@gmail.com> | 2011-06-02 22:09:52 +0200 |
|---|---|---|
| committer | Jef van Schendel <jefvanschendel@gmail.com> | 2011-06-02 22:09:52 +0200 |
| commit | 6a6355a98957f52ac6d76de55aad584867f882fe (patch) | |
| tree | 84c7100f92d9193a7199e4e8ecbb8ff2bf64c1d9 /mediagoblin/decorators.py | |
| parent | 54f9d72356e2c3ed1a3afa2cdced1704534f594c (diff) | |
| parent | a77d952aa6659f0291f856495b18a43dd7e28508 (diff) | |
| download | mediagoblin-6a6355a98957f52ac6d76de55aad584867f882fe.tar.lz mediagoblin-6a6355a98957f52ac6d76de55aad584867f882fe.tar.xz mediagoblin-6a6355a98957f52ac6d76de55aad584867f882fe.zip | |
Merge remote-tracking branch 'gitorious/master'
Diffstat (limited to 'mediagoblin/decorators.py')
| -rw-r--r-- | mediagoblin/decorators.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/mediagoblin/decorators.py b/mediagoblin/decorators.py index ff3f0b5e..a5bede54 100644 --- a/mediagoblin/decorators.py +++ b/mediagoblin/decorators.py @@ -36,9 +36,12 @@ 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"), |