Revision fbaa4f3c
b/snf-astakos-app/astakos/im/models.py | ||
---|---|---|
374 | 374 |
default=False, db_index=True) |
375 | 375 |
|
376 | 376 |
objects = AstakosUserManager() |
377 |
|
|
377 |
|
|
378 | 378 |
owner = models.ManyToManyField( |
379 | 379 |
AstakosGroup, related_name='owner', null=True) |
380 | 380 |
|
... | ... | |
499 | 499 |
if not self.id: |
500 | 500 |
# set username |
501 | 501 |
self.username = self.email |
502 |
|
|
502 |
|
|
503 | 503 |
self.validate_unique_email_isactive() |
504 | 504 |
if self.is_active and self.activation_sent: |
505 | 505 |
# reset the activation sent |
... | ... | |
639 | 639 |
provider = self.add_auth_provider(pending.provider, |
640 | 640 |
identifier=pending.third_party_identifier) |
641 | 641 |
|
642 |
if email_re.match(pending.email) and pending.email != self.email: |
|
642 |
if email_re.match(pending.email or '') and pending.email != self.email:
|
|
643 | 643 |
self.additionalmail_set.get_or_create(email=pending.email) |
644 | 644 |
|
645 | 645 |
pending.delete() |
Also available in: Unified diff