heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed bug where someone who wasn't logged in was asked to verify

Browse Source 
their emails.
This commit is contained in:
Aleksandar Micovic 2011-05-31 15:26:00 -04:00
parent 28afb47ca8
commit bcec749b52
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mediagoblin/decorators.py
View File

@ -36,12 +36,13 @@ def require_active_login(controller):
Require an active login from the user. Require an active login from the user.
""" """
def new_controller_func(request, *args, **kwargs): def new_controller_func(request, *args, **kwargs):
if not request.user or not request.user.get('status') == u'active': if request.user and request.user.get('status') == u'needs_email_verification':
# TODO: Indicate to the user that they were redirected return exc.HTTPFound(
# here because an *active* user is required. location = request.urlgen('mediagoblin.auth.verify_email_notice'))
elif not request.user or request.user.get('status') != u'active':
return exc.HTTPFound( return exc.HTTPFound(
location="%s?next=%s" % ( location="%s?next=%s" % (
request.urlgen("mediagoblin.auth.verify_email_notice"), request.urlgen("mediagoblin.auth.login"),
request.path_info)) request.path_info))
return controller(request, *args, **kwargs) return controller(request, *args, **kwargs)