diff options
| author | Elrond <elrond+mediagoblin.org@samba-tng.org> | 2011-06-02 14:33:26 +0200 |
|---|---|---|
| committer | Elrond <elrond+mediagoblin.org@samba-tng.org> | 2011-06-02 14:41:50 +0200 |
| commit | 7fd6f623f1cb558360c940a6dd1dc6c1e74fe31b (patch) | |
| tree | 89c29354c416cbcbf2eb0827e61c7084a80fdf22 /mediagoblin/decorators.py | |
| parent | c849e690925cb656b8c00ccbeda12aeab22c2fdd (diff) | |
| parent | 4d4b49a84e2791da6b12ef580565251c379264b6 (diff) | |
| download | mediagoblin-7fd6f623f1cb558360c940a6dd1dc6c1e74fe31b.tar.lz mediagoblin-7fd6f623f1cb558360c940a6dd1dc6c1e74fe31b.tar.xz mediagoblin-7fd6f623f1cb558360c940a6dd1dc6c1e74fe31b.zip | |
Merge remote branch 'upstream/master'
Conflicts:
mediagoblin/templates/mediagoblin/user_pages/media.html
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 fe631112..34575320 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"), |