merge --squash persona branch to take care of a false merge commit in
the basic_auth branch that persona is forked from Conflicts: mediagoblin/templates/mediagoblin/auth/login.html mediagoblin/templates/mediagoblin/auth/register.html mediagoblin/templates/mediagoblin/edit/edit_account.html These are commit messages from the squashed persona stuff: - added tests and fixed minor errors - fixed a redirect loop when only persona is enabled and accessing /auth/login - moved persona.js to plugin's static dir - fixes for add/remove persona emails - add and remove personas - working with multiple plugins - working version - switched to hidden form instead of ajax - beginings
This commit is contained in:
committed by
Christopher Allan Webber
parent
41a14c6efc
commit
4f8f0a4e1f
@@ -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)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user