Browse Source

Added decorators

Rafał Pitoń 11 years ago
parent
commit
2c054b3e1c
1 changed files with 7 additions and 7 deletions
  1. 7 7
      misago/users/views/register.py

+ 7 - 7
misago/users/views/register.py

@@ -3,6 +3,7 @@ from django.contrib.auth import authenticate, get_user_model, login
 from django.http import Http404
 from django.http import Http404
 from django.shortcuts import get_object_or_404, redirect, render
 from django.shortcuts import get_object_or_404, redirect, render
 from django.utils.translation import ugettext as _
 from django.utils.translation import ugettext as _
+from django.views.decorators.cache import never_cache
 from django.views.decorators.debug import sensitive_post_parameters
 from django.views.decorators.debug import sensitive_post_parameters
 
 
 from misago.conf import settings
 from misago.conf import settings
@@ -26,6 +27,7 @@ def register_decorator(f):
 
 
 
 
 @sensitive_post_parameters("email", "password")
 @sensitive_post_parameters("email", "password")
+@never_cache
 @deny_authenticated
 @deny_authenticated
 @deny_banned_ips
 @deny_banned_ips
 @register_decorator
 @register_decorator
@@ -68,13 +70,12 @@ def register(request):
                 mail_user(request, new_user, mail_subject,
                 mail_user(request, new_user, mail_subject,
                           'misago/emails/register/complete')
                           'misago/emails/register/complete')
 
 
-                return redirect('misago:index')
+                return redirect(settings.LOGIN_REDIRECT_URL)
             else:
             else:
                 activation_token = make_activation_token(new_user)
                 activation_token = make_activation_token(new_user)
 
 
-                method = new_user.requires_activation
-                activation_by_admin = method == ACTIVATION_REQUIRED_ADMIN
-                activation_by_user = method == ACTIVATION_REQUIRED_USER
+                activation_by_admin = new_user.requires_activation_by_admin
+                activation_by_user = new_user.requires_activation_by_user
 
 
                 mail_user(
                 mail_user(
                     request, new_user, mail_subject,
                     request, new_user, mail_subject,
@@ -109,9 +110,8 @@ def register_completed(request):
     if not registered_user.requires_activation:
     if not registered_user.requires_activation:
         return redirect('misago:index')
         return redirect('misago:index')
 
 
-    activation_method = registered_user.requires_activation
-    activation_by_admin = activation_method == ACTIVATION_REQUIRED_ADMIN
-    activation_by_user = activation_method == ACTIVATION_REQUIRED_USER
+    activation_by_admin = registered_user.requires_activation_by_admin
+    activation_by_user = registered_user.requires_activation_by_user
 
 
     return render(
     return render(
         request,
         request,