Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
itminedu
synnefo
Commits
7b68390a
Commit
7b68390a
authored
Dec 03, 2012
by
Kostas Papadimitriou
Browse files
Handle empty third party email
parent
8210bac2
Changes
1
Hide whitespace changes
Inline
Side-by-side
snf-astakos-app/astakos/im/models.py
View file @
7b68390a
...
...
@@ -374,7 +374,7 @@ class AstakosUser(User):
default
=
False
,
db_index
=
True
)
objects
=
AstakosUserManager
()
owner
=
models
.
ManyToManyField
(
AstakosGroup
,
related_name
=
'owner'
,
null
=
True
)
...
...
@@ -499,7 +499,7 @@ class AstakosUser(User):
if
not
self
.
id
:
# set username
self
.
username
=
self
.
email
self
.
validate_unique_email_isactive
()
if
self
.
is_active
and
self
.
activation_sent
:
# reset the activation sent
...
...
@@ -639,7 +639,7 @@ class AstakosUser(User):
provider
=
self
.
add_auth_provider
(
pending
.
provider
,
identifier
=
pending
.
third_party_identifier
)
if
email_re
.
match
(
pending
.
email
)
and
pending
.
email
!=
self
.
email
:
if
email_re
.
match
(
pending
.
email
or
''
)
and
pending
.
email
!=
self
.
email
:
self
.
additionalmail_set
.
get_or_create
(
email
=
pending
.
email
)
pending
.
delete
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment