diff options
| author | tilly-Q <nattilypigeonfowl@gmail.com> | 2013-08-20 12:21:13 -0400 |
|---|---|---|
| committer | tilly-Q <nattilypigeonfowl@gmail.com> | 2013-08-20 12:21:13 -0400 |
| commit | 9e204e49c9670b0e004dc9b62bf3b698b7534325 (patch) | |
| tree | 452eab56add0e1b009b665f5b32d7b59b7545e82 /mediagoblin/auth | |
| parent | e1561d048815e29b3b7c7e1c860d9cf0c4326f0a (diff) | |
| parent | c62d174437445565b55b220396e7571a323a159c (diff) | |
| download | mediagoblin-9e204e49c9670b0e004dc9b62bf3b698b7534325.tar.lz mediagoblin-9e204e49c9670b0e004dc9b62bf3b698b7534325.tar.xz mediagoblin-9e204e49c9670b0e004dc9b62bf3b698b7534325.zip | |
Merge branch 'master' into OPW-Moderation-Update
Conflicts:
mediagoblin/db/models.py
mediagoblin/decorators.py
mediagoblin/routing.py
mediagoblin/user_pages/views.py
Diffstat (limited to 'mediagoblin/auth')
| -rw-r--r-- | mediagoblin/auth/views.py | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/mediagoblin/auth/views.py b/mediagoblin/auth/views.py index 90d6f5cc..7d95b81a 100644 --- a/mediagoblin/auth/views.py +++ b/mediagoblin/auth/views.py @@ -41,8 +41,11 @@ def register(request): """ if 'pass_auth' not in request.template_env.globals: redirect_name = hook_handle('auth_no_pass_redirect') - return redirect(request, 'mediagoblin.plugins.{0}.register'.format( - redirect_name)) + if redirect_name: + return redirect(request, 'mediagoblin.plugins.{0}.register'.format( + redirect_name)) + else: + return redirect(request, 'index') register_form = hook_handle("auth_get_registration_form", request) @@ -73,8 +76,11 @@ def login(request): """ if 'pass_auth' not in request.template_env.globals: redirect_name = hook_handle('auth_no_pass_redirect') - return redirect(request, 'mediagoblin.plugins.{0}.login'.format( - redirect_name)) + if redirect_name: + return redirect(request, 'mediagoblin.plugins.{0}.login'.format( + redirect_name)) + else: + return redirect(request, 'index') login_form = hook_handle("auth_get_login_form", request) |