From 99f5c02d844c97e1b3ff0ee008550ee34da6a925 Mon Sep 17 00:00:00 2001 From: Bai Date: Thu, 24 Nov 2022 17:04:27 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E8=8E=B7=E5=8F=96=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=8E=88=E6=9D=83=E7=9A=84=E8=B4=A6=E5=8F=B7=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=20has=5Fusername=20=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/models/base.py | 4 ++++ apps/perms/serializers/user_permission.py | 8 ++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/assets/models/base.py b/apps/assets/models/base.py index 90fb384e6..cc6ea17fe 100644 --- a/apps/assets/models/base.py +++ b/apps/assets/models/base.py @@ -62,6 +62,10 @@ class BaseAccount(JMSOrgBaseModel): def has_secret(self): return bool(self.secret) + @property + def has_username(self): + return bool(self.username) + @property def specific(self): data = {} diff --git a/apps/perms/serializers/user_permission.py b/apps/perms/serializers/user_permission.py index 1d795d650..3b60d25bb 100644 --- a/apps/perms/serializers/user_permission.py +++ b/apps/perms/serializers/user_permission.py @@ -12,7 +12,7 @@ from perms.serializers.permission import ActionChoicesField __all__ = [ 'NodeGrantedSerializer', 'AssetGrantedSerializer', - 'ActionsSerializer', 'AccountsPermedSerializer' + 'AccountsPermedSerializer' ] @@ -43,14 +43,10 @@ class NodeGrantedSerializer(serializers.ModelSerializer): read_only_fields = fields -class ActionsSerializer(serializers.Serializer): - actions = ActionChoicesField(read_only=True) - - class AccountsPermedSerializer(serializers.ModelSerializer): actions = ActionChoicesField(read_only=True) class Meta: model = Account - fields = ['id', 'name', 'username', 'secret_type', 'has_secret', 'actions'] + fields = ['id', 'name', 'has_username', 'username', 'has_secret', 'secret_type', 'actions'] read_only_fields = fields