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

[Update] 更新移动的model

pull/2462/head
ibuler 2019-03-04 17:07:51 +08:00
parent ad6d233c11
commit 924affd978
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/users/migrations/0019_auto_20190304_1459.py
View File

@ -10,8 +10,8 @@ class Migration(migrations.Migration):
] ]
database_operations = [ database_operations = [
migrations.AlterModelTable(name='accesskey', table='autentication_accesskey'), migrations.AlterModelTable(name='accesskey', table='authentication_accesskey'),
migrations.AlterModelTable(name='privatetoken', table='autentication_privatetoken'), migrations.AlterModelTable(name='privatetoken', table='authentication_privatetoken'),
migrations.AlterModelTable(name='loginlog', table='audits_userloginlog'), migrations.AlterModelTable(name='loginlog', table='audits_userloginlog'),
] ]

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

@ -321,8 +321,7 @@ class User(AbstractUser):
pass pass
def create_access_key(self): def create_access_key(self):
from . import AccessKey access_key = self.access_keys.create()
access_key = AccessKey.objects.create(user=self)
return access_key return access_key
@property @property
@ -334,11 +333,6 @@ class User(AbstractUser):
return True return True
return False return False
def check_public_key(self, public_key):
if self.ssh_public_key == public_key:
return True
return False
def avatar_url(self): def avatar_url(self):
admin_default = settings.STATIC_URL + "img/avatar/admin.png" admin_default = settings.STATIC_URL + "img/avatar/admin.png"
user_default = settings.STATIC_URL + "img/avatar/user.png" user_default = settings.STATIC_URL + "img/avatar/user.png"