From 28afb47ca82b0857aad546ef4cbf869de1ca95a5 Mon Sep 17 00:00:00 2001 From: Aleksandar Micovic Date: Mon, 30 May 2011 23:51:30 -0400 Subject: Added a temporary verification page informing the user they need to authenticate. --- mediagoblin/decorators.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mediagoblin/decorators.py') diff --git a/mediagoblin/decorators.py b/mediagoblin/decorators.py index ff3f0b5e..bb625667 100644 --- a/mediagoblin/decorators.py +++ b/mediagoblin/decorators.py @@ -41,7 +41,7 @@ def require_active_login(controller): # here because an *active* user is required. return exc.HTTPFound( location="%s?next=%s" % ( - request.urlgen("mediagoblin.auth.login"), + request.urlgen("mediagoblin.auth.verify_email_notice"), request.path_info)) return controller(request, *args, **kwargs) -- cgit v1.2.3 From bcec749b52c287a6d361fd06bfbd833e03e5b478 Mon Sep 17 00:00:00 2001 From: Aleksandar Micovic Date: Tue, 31 May 2011 15:26:00 -0400 Subject: Fixed bug where someone who wasn't logged in was asked to verify their emails. --- mediagoblin/decorators.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'mediagoblin/decorators.py') diff --git a/mediagoblin/decorators.py b/mediagoblin/decorators.py index bb625667..bc12d61c 100644 --- a/mediagoblin/decorators.py +++ b/mediagoblin/decorators.py @@ -36,12 +36,13 @@ 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.verify_email_notice"), + request.urlgen("mediagoblin.auth.login"), request.path_info)) return controller(request, *args, **kwargs) -- cgit v1.2.3 From a72c504b257c7e2a2c3fec7da67bad5e0f6095be Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Tue, 31 May 2011 19:30:05 -0500 Subject: Just adjusting some spacing so we don't go over 80 chars --- mediagoblin/decorators.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'mediagoblin/decorators.py') diff --git a/mediagoblin/decorators.py b/mediagoblin/decorators.py index bc12d61c..a5bede54 100644 --- a/mediagoblin/decorators.py +++ b/mediagoblin/decorators.py @@ -36,9 +36,11 @@ def require_active_login(controller): Require an active login from the user. """ def new_controller_func(request, *args, **kwargs): - if request.user and request.user.get('status') == u'needs_email_verification': + if request.user and \ + request.user.get('status') == u'needs_email_verification': return exc.HTTPFound( - location = request.urlgen('mediagoblin.auth.verify_email_notice')) + 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" % ( -- cgit v1.2.3