From d012880a903d45b43f8efab31fd74a3bb32f4e13 Mon Sep 17 00:00:00 2001 From: ibuler Date: Thu, 13 Jul 2017 11:46:56 +0800 Subject: [PATCH] =?UTF-8?q?[Bugfix]=20=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/users/models/user.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/users/models/user.py b/apps/users/models/user.py index 2772558d8..fc40ee87a 100644 --- a/apps/users/models/user.py +++ b/apps/users/models/user.py @@ -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({