pref: 修改 account secret_type 类型

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']

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 = [

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

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