aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/decorators.py
diff options
context:
space:
mode:
Diffstat (limited to 'mediagoblin/decorators.py')
-rw-r--r--mediagoblin/decorators.py9
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"),