From 5730265183e3a12af2e3b1a2e68820f870214f82 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Tue, 8 Nov 2022 19:18:04 +0800
Subject: [PATCH] =?UTF-8?q?pref:=20=E4=BF=AE=E6=94=B9=20account=20secret?=
 =?UTF-8?q?=5Ftype=20=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/assets/serializers/account/account.py | 6 +++++-
 apps/assets/serializers/account/base.py    | 5 ++++-
 apps/locale/zh/LC_MESSAGES/django.mo       | 4 ++--
 apps/locale/zh/LC_MESSAGES/django.po       | 2 +-
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/apps/assets/serializers/account/account.py b/apps/assets/serializers/account/account.py
index efd8d9060..c6fcd4496 100644
--- a/apps/assets/serializers/account/account.py
+++ b/apps/assets/serializers/account/account.py
@@ -2,10 +2,11 @@ from django.utils.translation import ugettext_lazy as _
 from rest_framework import serializers
 
 from common.drf.serializers import SecretReadableMixin
-from common.drf.fields import ObjectRelatedField
+from common.drf.fields import ObjectRelatedField, LabeledChoiceField
 from assets.tasks import push_accounts_to_assets
 from assets.models import Account, AccountTemplate, Asset
 from .base import BaseAccountSerializer
+from assets.const import SecretType
 
 
 class AccountSerializerCreateMixin(serializers.ModelSerializer):
@@ -57,6 +58,7 @@ class AccountSerializer(AccountSerializerCreateMixin, BaseAccountSerializer):
         required=False, queryset=Asset.objects,
         label=_('Asset'), attrs=('id', 'name', 'address', 'platform_id')
     )
+    secret_type = LabeledChoiceField(choices=SecretType.choices, label=_('Secret type'))
 
     class Meta(BaseAccountSerializer.Meta):
         model = Account
@@ -91,6 +93,8 @@ class AccountSecretSerializer(SecretReadableMixin, AccountSerializer):
 
 
 class AccountHistorySerializer(serializers.ModelSerializer):
+    secret_type = LabeledChoiceField(choices=SecretType.choices, label=_('Secret type'))
+
     class Meta:
         model = Account.history.model
         fields = ['id', 'secret', 'secret_type', 'version', 'history_date', 'history_user']
diff --git a/apps/assets/serializers/account/base.py b/apps/assets/serializers/account/base.py
index 8e03a967e..e086da02a 100644
--- a/apps/assets/serializers/account/base.py
+++ b/apps/assets/serializers/account/base.py
@@ -21,7 +21,10 @@ class BaseAccountSerializer(BulkOrgResourceModelSerializer):
     class Meta:
         model = BaseAccount
         fields_mini = ['id', 'name', 'username']
-        fields_small = fields_mini + ['privileged', 'secret_type', 'secret', 'has_secret', 'specific']
+        fields_small = fields_mini + [
+            'secret_type', 'secret', 'has_secret',
+            'privileged', 'is_active', 'specific',
+        ]
         fields_other = ['created_by', 'date_created', 'date_updated', 'comment']
         fields = fields_small + fields_other
         read_only_fields = [
diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo
index 9ba5f0837..bb0411aa6 100644
--- a/apps/locale/zh/LC_MESSAGES/django.mo
+++ b/apps/locale/zh/LC_MESSAGES/django.mo
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0b396cc9a485f6474d14ca30a1a7ba4f954b07754148b964efbb21519c55b280
-size 102849
+oid sha256:314c29cb8b10aaddbb030bf49af293be23f0153ff1f1c7562946879574ce6de8
+size 102801
diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po
index 131862b1a..6ab6fa2be 100644
--- a/apps/locale/zh/LC_MESSAGES/django.po
+++ b/apps/locale/zh/LC_MESSAGES/django.po
@@ -858,7 +858,7 @@ msgstr "校验日期"
 
 #: assets/models/base.py:63
 msgid "Privileged"
-msgstr "特权的"
+msgstr "特权账号"
 
 #: assets/models/cmd_filter.py:32 perms/models/asset_permission.py:61
 #: users/models/group.py:31 users/models/user.py:671