aboutsummaryrefslogtreecommitdiffstats
path: root/account
diff options
context:
space:
mode:
authorWeitian LI <liweitianux@gmail.com>2014-04-27 19:31:18 +0800
committerWeitian LI <liweitianux@gmail.com>2014-04-27 19:31:18 +0800
commitce1c277ee1904fb30df82f75a024822bd3411892 (patch)
tree30cafb886ea2da1e94a30082994251399d3f6df8 /account
parentb784a30dd8c92f8e7f49a15e564c8ff422e85f94 (diff)
downloaddjango-skaschool-ce1c277ee1904fb30df82f75a024822bd3411892.tar.bz2
* implemented function to auto login user after activation
o added 'login_on_activation' and connected to 'user_activated' signal o updated 'activation_complete.html' template
Diffstat (limited to 'account')
-rw-r--r--account/models.py18
1 files changed, 15 insertions, 3 deletions
diff --git a/account/models.py b/account/models.py
index 9886f6c..b42a8d1 100644
--- a/account/models.py
+++ b/account/models.py
@@ -5,13 +5,14 @@
#
from django.db import models
+from django.conf import settings
from django.contrib.auth.models import User
+from django.contrib.auth import login
from django.db.models.fields.files import FieldFile
-from django.conf import settings
from django.utils.translation import ugettext_lazy as _
from django.db.models.signals import pre_delete
-from registration.signals import user_registered
+from registration.signals import user_registered, user_activated
from account.extra import ContentTypeRestrictedFileField, OverwriteStorage
@@ -235,9 +236,20 @@ def user_registered_callback(sender, user, request, **kwargs):
profile.identify = request.POST['identify']
profile.save()
-### connect 'user_registered_callback' to signal
+### connect 'user_registered_callback' to signal user_registered
user_registered.connect(user_registered_callback)
+### login user after activated
+def login_on_activation(sender, user, request, **kwargs):
+ """
+ Logs in the user after activation
+ """
+ user.backend = 'django.contrib.auth.backends.ModelBackend'
+ login(request, user)
+
+# connect 'login_on_activation' to signal user_activated
+user_activated.connect(login_on_activation)
+
### delete files associated with model FileField
# Pre-delete signal function for deleting files a model