github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

[Bugfix] 修复bug

pull/542/head
ibuler 2017-07-13 11:46:56 +08:00
parent 3ce07cf969
commit d012880a90
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/users/models/user.py
View File

@ -73,7 +73,7 @@ class User(AbstractUser):
@property
def is_expired(self):
if self.date_expired < timezone.now():
if self.date_expired and self.date_expired < timezone.now():
return True
else:
return False
@ -189,7 +189,7 @@ class User(AbstractUser):
return 'https://www.gravatar.com/avatar/c6812ab450230979465d7bf288eadce2a?s=120&d=identicon'
def generate_reset_token(self):
return signer.sign_t({'reset': self.id, 'email': self.email}, expires_in=3600).decode('utf-8')
return signer.sign_t({'reset': self.id, 'email': self.email}, expires_in=3600)
def to_json(self):
return OrderedDict({