From c924f48d79f7f578d1ffa21dd94fafb748720526 Mon Sep 17 00:00:00 2001 From: Bai Date: Mon, 26 Dec 2022 15:33:43 +0800 Subject: [PATCH 1/2] perf: gitignore add .fleet/ --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index e1e5f32d7..3f398175f 100644 --- a/.gitignore +++ b/.gitignore @@ -16,6 +16,7 @@ dump.rdb .cache/ .idea/ .vscode/ +.fleet/ db.sqlite3 config.py config.yml From d2ba7a98eab157173605c7477cf6df855827cd57 Mon Sep 17 00:00:00 2001 From: Bai Date: Mon, 26 Dec 2022 16:15:44 +0800 Subject: [PATCH 2/2] =?UTF-8?q?perf:=20=E4=BF=AE=E6=94=B9=E6=8E=88?= =?UTF-8?q?=E6=9D=83=E5=BA=8F=E5=88=97=E7=B1=BB=E5=AD=97=E6=AE=B5=E7=BF=BB?= =?UTF-8?q?=E8=AF=91=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/perms/serializers/permission.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/perms/serializers/permission.py b/apps/perms/serializers/permission.py index fc2bf1cf3..673b567c5 100644 --- a/apps/perms/serializers/permission.py +++ b/apps/perms/serializers/permission.py @@ -20,12 +20,12 @@ class ActionChoicesField(BitChoicesField): class AssetPermissionSerializer(BulkOrgResourceModelSerializer): - users = ObjectRelatedField(queryset=User.objects, many=True, required=False) + users = ObjectRelatedField(queryset=User.objects, many=True, required=False, label=_('User')) user_groups = ObjectRelatedField( - queryset=UserGroup.objects, many=True, required=False + queryset=UserGroup.objects, many=True, required=False, label=_('User group') ) - assets = ObjectRelatedField(queryset=Asset.objects, many=True, required=False) - nodes = ObjectRelatedField(queryset=Node.objects, many=True, required=False) + assets = ObjectRelatedField(queryset=Asset.objects, many=True, required=False, label=_('Asset')) + nodes = ObjectRelatedField(queryset=Node.objects, many=True, required=False, label=_('Node')) actions = ActionChoicesField(required=False, allow_null=True, label=_("Actions")) is_valid = serializers.BooleanField(read_only=True, label=_("Is valid")) is_expired = serializers.BooleanField(read_only=True, label=_("Is expired"))