git://git.onelab.eu
/
plstackapi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix tenant view temporary password email, display message if user tries to register...
[plstackapi.git]
/
planetstack
/
core
/
models
/
user.py
diff --git
a/planetstack/core/models/user.py
b/planetstack/core/models/user.py
index
3f933fe
..
c8df836
100644
(file)
--- a/
planetstack/core/models/user.py
+++ b/
planetstack/core/models/user.py
@@
-158,6
+158,7
@@
class User(AbstractBaseUser): #, DiffModelMixIn):
is_admin = models.BooleanField(default=False)
is_staff = models.BooleanField(default=True)
is_readonly = models.BooleanField(default=False)
is_admin = models.BooleanField(default=False)
is_staff = models.BooleanField(default=True)
is_readonly = models.BooleanField(default=False)
+ is_registering = models.BooleanField(default=False)
created = models.DateTimeField(auto_now_add=True)
updated = models.DateTimeField(auto_now=True)
created = models.DateTimeField(auto_now_add=True)
updated = models.DateTimeField(auto_now=True)
@@
-262,9
+263,10
@@
class User(AbstractBaseUser): #, DiffModelMixIn):
def save(self, *args, **kwds):
if not self.id:
self.set_password(self.password)
def save(self, *args, **kwds):
if not self.id:
self.set_password(self.password)
- if self.is_active:
- if self.password=="!":
\r
- self.send_temporary_password()
\r
+ print "XXX", self, self.is_active, self.is_registering
+ if self.is_active and self.is_registering:
+ self.send_temporary_password()
\r
+ self.is_registering=False
\r
\r
self.username = self.email
super(User, self).save(*args, **kwds)
\r
self.username = self.email
super(User, self).save(*args, **kwds)