Revision 3dfb68fe snf-astakos-app/astakos/im/models.py
| b/snf-astakos-app/astakos/im/models.py | ||
|---|---|---|
| 328 | 328 |
affiliation = models.CharField(_('Affiliation'), max_length=255, blank=True,
|
| 329 | 329 |
null=True) |
| 330 | 330 |
|
| 331 |
# DEPRECATED FIELDS: provider, third_party_identifier moved in |
|
| 332 |
# AstakosUserProvider model. |
|
| 333 |
provider = models.CharField(_('Provider'), max_length=255, blank=True,
|
|
| 334 |
null=True) |
|
| 335 |
# ex. screen_name for twitter, eppn for shibboleth |
|
| 336 |
third_party_identifier = models.CharField(_('Third-party identifier'),
|
|
| 337 |
max_length=255, null=True, |
|
| 338 |
blank=True) |
|
| 339 |
|
|
| 340 |
|
|
| 341 | 331 |
#for invitations |
| 342 | 332 |
user_level = DEFAULT_USER_LEVEL |
| 343 | 333 |
level = models.IntegerField(_('Inviter level'), default=user_level)
|
| ... | ... | |
| 1114 | 1104 |
unique_together = ("provider", "third_party_identifier")
|
| 1115 | 1105 |
|
| 1116 | 1106 |
def get_user_instance(self): |
| 1117 |
d = self.__dict__
|
|
| 1107 |
d = copy.copy(self.__dict__)
|
|
| 1118 | 1108 |
d.pop('_state', None)
|
| 1119 | 1109 |
d.pop('id', None)
|
| 1120 | 1110 |
d.pop('token', None)
|
| 1121 | 1111 |
d.pop('created', None)
|
| 1122 | 1112 |
d.pop('info', None)
|
| 1113 |
d.pop('affiliation', None)
|
|
| 1114 |
d.pop('provider', None)
|
|
| 1115 |
d.pop('third_party_identifier', None)
|
|
| 1123 | 1116 |
user = AstakosUser(**d) |
| 1124 | 1117 |
|
| 1125 | 1118 |
return user |
Also available in: Unified diff