Commit 59e1f5a5 by Piotr Mitros

Account already active is there

parent e3d936ad
...@@ -48,5 +48,5 @@ class Registration(models.Model): ...@@ -48,5 +48,5 @@ class Registration(models.Model):
def activate(self): def activate(self):
self.user.is_active = True self.user.is_active = True
self.user.save() self.user.save()
self.delete() #self.delete()
...@@ -230,9 +230,11 @@ if settings.GENERATE_RANDOM_USER_CREDENTIALS: ...@@ -230,9 +230,11 @@ if settings.GENERATE_RANDOM_USER_CREDENTIALS:
def activate_account(request, key): def activate_account(request, key):
r=Registration.objects.filter(activation_key=key) r=Registration.objects.filter(activation_key=key)
if len(r)==1: if len(r)==1:
r[0].activate() if not r[0].user.is_active:
resp = render_to_response("activation_complete.html",{'csrf':csrf(request)['csrf_token']}) r[0].activate()
# print len(connection.queries), connection.queries 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 return resp
if len(r)==0: if len(r)==0:
return render_to_response("activation_invalid.html",{'csrf':csrf(request)['csrf_token']}) return render_to_response("activation_invalid.html",{'csrf':csrf(request)['csrf_token']})
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment