github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-09 11:19:08 +00:00
Code Issues Projects Releases Wiki Activity

添加一个资产，然后推送系统用户时出现（Asset实例无法序列化） (#477)

Browse Source 
* error while push systemuser. error while create assets with adminuser(ssh key)

* fix errors in case of config.py dose not exist.

* change sign_t return from bytes to str. (#480)

* fix id_dsa check error (#458)

* fix id_dsa check error

* fix 邮件修改密码 token错误

* fix 3c8aec9 add )

* Dockerfile 优化 (#453)
This commit is contained in:
Eli
2017-07-10 11:01:20 +08:00
committed by 老广
parent 235cbe12ee
commit 370cdc275a
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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)
return signer.sign_t({'reset': self.id, 'email': self.email}, expires_in=3600).decode('utf-8')
def to_json(self):
return OrderedDict({