From 924affd978116fa9e1ea009b95c459438e5dca05 Mon Sep 17 00:00:00 2001 From: ibuler Date: Mon, 4 Mar 2019 17:07:51 +0800 Subject: [PATCH] =?UTF-8?q?[Update]=20=E6=9B=B4=E6=96=B0=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E7=9A=84model?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/users/migrations/0019_auto_20190304_1459.py | 4 ++-- apps/users/models/user.py | 8 +------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/apps/users/migrations/0019_auto_20190304_1459.py b/apps/users/migrations/0019_auto_20190304_1459.py index 6bb9cced0..e8b1ea8d5 100644 --- a/apps/users/migrations/0019_auto_20190304_1459.py +++ b/apps/users/migrations/0019_auto_20190304_1459.py @@ -10,8 +10,8 @@ class Migration(migrations.Migration): ] database_operations = [ - migrations.AlterModelTable(name='accesskey', table='autentication_accesskey'), - migrations.AlterModelTable(name='privatetoken', table='autentication_privatetoken'), + migrations.AlterModelTable(name='accesskey', table='authentication_accesskey'), + migrations.AlterModelTable(name='privatetoken', table='authentication_privatetoken'), migrations.AlterModelTable(name='loginlog', table='audits_userloginlog'), ] diff --git a/apps/users/models/user.py b/apps/users/models/user.py index d86e42884..52d2c0105 100644 --- a/apps/users/models/user.py +++ b/apps/users/models/user.py @@ -321,8 +321,7 @@ class User(AbstractUser): pass def create_access_key(self): - from . import AccessKey - access_key = AccessKey.objects.create(user=self) + access_key = self.access_keys.create() return access_key @property @@ -334,11 +333,6 @@ class User(AbstractUser): return True return False - def check_public_key(self, public_key): - if self.ssh_public_key == public_key: - return True - return False - def avatar_url(self): admin_default = settings.STATIC_URL + "img/avatar/admin.png" user_default = settings.STATIC_URL + "img/avatar/user.png"