Account already active is there

This commit is contained in:
Piotr Mitros
2012-02-08 13:01:21 -05:00
parent e3d936ad08
commit 59e1f5a50a
2 changed files with 6 additions and 4 deletions

View File

@@ -48,5 +48,5 @@ class Registration(models.Model):
def activate(self):
self.user.is_active = True
self.user.save()
self.delete()
#self.delete()

View File

@@ -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']})