Revision 4d0bdd3b snf-astakos-app/astakos/im/models.py
b/snf-astakos-app/astakos/im/models.py | ||
---|---|---|
602 | 602 |
return True |
603 | 603 |
|
604 | 604 |
def has_auth_provider(self, provider, **kwargs): |
605 |
return bool(self.auth_providers.filter(module=provider,
|
|
605 |
return bool(self.get_auth_providers().filter(module=provider,
|
|
606 | 606 |
**kwargs).count()) |
607 | 607 |
|
608 | 608 |
def add_auth_provider(self, provider, **kwargs): |
... | ... | |
641 | 641 |
return provider |
642 | 642 |
|
643 | 643 |
def remove_auth_provider(self, provider, **kwargs): |
644 |
self.auth_providers.get(module=provider, **kwargs).delete()
|
|
644 |
self.get_auth_providers().get(module=provider, **kwargs).delete()
|
|
645 | 645 |
|
646 | 646 |
# user urls |
647 | 647 |
def get_resend_activation_url(self): |
... | ... | |
649 | 649 |
|
650 | 650 |
def get_provider_remove_url(self, module, **kwargs): |
651 | 651 |
return reverse('remove_auth_provider', kwargs={ |
652 |
'pk': self.auth_providers.get(module=module, **kwargs).pk})
|
|
652 |
'pk': self.get_auth_providers().get(module=module, **kwargs).pk})
|
|
653 | 653 |
|
654 | 654 |
def get_activation_url(self, nxt=False): |
655 | 655 |
url = "%s?auth=%s" % (reverse('astakos.im.views.activate'), |
... | ... | |
664 | 664 |
'token':token_generator.make_token(self)}) |
665 | 665 |
|
666 | 666 |
def get_auth_providers(self): |
667 |
return self.auth_providers.all()
|
|
667 |
return self.auth_providers |
|
668 | 668 |
|
669 | 669 |
def get_available_auth_providers(self): |
670 | 670 |
""" |
... | ... | |
679 | 679 |
|
680 | 680 |
def get_active_auth_providers(self, **filters): |
681 | 681 |
providers = [] |
682 |
for provider in self.auth_providers.active(**filters):
|
|
682 |
for provider in self.get_auth_providers().active(**filters):
|
|
683 | 683 |
if auth_providers.get_provider(provider.module).is_available_for_login(): |
684 | 684 |
providers.append(provider) |
685 | 685 |
return providers |
686 | 686 |
|
687 | 687 |
@property |
688 | 688 |
def auth_providers_display(self): |
689 |
return ",".join(map(lambda x:unicode(x), self.auth_providers.active()))
|
|
689 |
return ",".join(map(lambda x:unicode(x), self.get_auth_providers().active()))
|
|
690 | 690 |
|
691 | 691 |
def get_inactive_message(self): |
692 | 692 |
msg_extra = '' |
Also available in: Unified diff