From 59e1f5a50a173d0ff695e9f0dd6805fd2e936880 Mon Sep 17 00:00:00 2001
From: Piotr Mitros <pmitros@mit.edu>
Date: Wed, 8 Feb 2012 13:01:21 -0500
Subject: [PATCH] Account already active is there
---
student/models.py | 2 +-
student/views.py | 8 +++++---
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/student/models.py b/student/models.py
index 39e0738c726..6c614966f97 100644
--- a/student/models.py
+++ b/student/models.py
@@ -48,5 +48,5 @@ class Registration(models.Model):
def activate(self):
self.user.is_active = True
self.user.save()
- self.delete()
+ #self.delete()
diff --git a/student/views.py b/student/views.py
index b00986ad158..397f32dc39c 100644
--- a/student/views.py
+++ b/student/views.py
@@ -230,9 +230,11 @@ if settings.GENERATE_RANDOM_USER_CREDENTIALS:
def activate_account(request, key):
r=Registration.objects.filter(activation_key=key)
if len(r)==1:
- r[0].activate()
- resp = render_to_response("activation_complete.html",{'csrf':csrf(request)['csrf_token']})
-# print len(connection.queries), connection.queries
+ if not r[0].user.is_active:
+ r[0].activate()
+ resp = render_to_response("activation_complete.html",{'csrf':csrf(request)['csrf_token']})
+ return resp
+ resp = render_to_response("activation_active.html",{'csrf':csrf(request)['csrf_token']})
return resp
if len(r)==0:
return render_to_response("activation_invalid.html",{'csrf':csrf(request)['csrf_token']})
--
GitLab