aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/auth/views.py
diff options
context:
space:
mode:
Diffstat (limited to 'mediagoblin/auth/views.py')
-rw-r--r--mediagoblin/auth/views.py30
1 files changed, 6 insertions, 24 deletions
diff --git a/mediagoblin/auth/views.py b/mediagoblin/auth/views.py
index 36d23e53..1d00f382 100644
--- a/mediagoblin/auth/views.py
+++ b/mediagoblin/auth/views.py
@@ -56,16 +56,12 @@ def register(request):
return redirect(request, "mediagoblin.auth.register_success")
- return render_to_response(request,
+ return render_to_response(
+ request,
'mediagoblin/auth/register.html',
{'register_form': register_form})
-def register_success(request):
- return render_to_response(request,
- 'mediagoblin/auth/register_success.html', {})
-
-
def login(request):
"""
MediaGoblin login view.
@@ -96,7 +92,8 @@ def login(request):
auth_lib.fake_login_attempt()
login_failed = True
- return render_to_response(request,
+ return render_to_response(
+ request,
'mediagoblin/auth/login.html',
{'login_form': login_form,
'next': request.GET.get('next') or request.POST.get('next'),
@@ -132,21 +129,12 @@ def verify_email(request):
else:
verification_successful = False
- return render_to_response(request,
+ return render_to_response(
+ request,
'mediagoblin/auth/verify_email.html',
{'user': user,
'verification_successful': verification_successful})
-def verify_email_notice(request):
- """
- Verify warning view.
-
- When the user tries to do some action that requires their account
- to be verified beforehand, this view is called upon!
- """
- return render_to_response(request,
- 'mediagoblin/auth/verification_needed.html', {})
-
def resend_activation(request):
"""
@@ -154,15 +142,9 @@ def resend_activation(request):
Resend the activation email.
"""
-
request.user['verification_key'] = unicode(uuid.uuid4())
request.user.save()
send_verification_email(request.user, request)
return redirect(request, 'mediagoblin.auth.resend_verification_success')
-
-
-def resend_activation_success(request):
- return render_to_response(request,
- 'mediagoblin/auth/resent_verification_email.html', {})