projects
/
astakos
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7ee456f
)
fix activate in case of dublicate accounts
author
root
<root@pithos.dev.grnet.gr>
Tue, 24 Apr 2012 17:50:49 +0000
(20:50 +0300)
committer
root
<root@pithos.dev.grnet.gr>
Tue, 24 Apr 2012 17:50:49 +0000
(20:50 +0300)
snf-astakos-app/astakos/im/views.py
patch
|
blob
|
history
diff --git
a/snf-astakos-app/astakos/im/views.py
b/snf-astakos-app/astakos/im/views.py
index
2f1df92
..
3dd3aff
100644
(file)
--- a/
snf-astakos-app/astakos/im/views.py
+++ b/
snf-astakos-app/astakos/im/views.py
@@
-436,7
+436,7
@@
def activate(request, email_template_name='im/welcome_email.txt', on_failure='')
return HttpResponseBadRequest(_('No such user'))
try:
- local_user = AstakosUser.objects.get(email=user.email, is_active=True, provider='local')
+ local_user = AstakosUser.objects.get(email=user.email, is_active=True)
except AstakosUser.DoesNotExist:
user.is_active = True
user.email_verified = True