From 52c905832b509620320eece552bb0f6395331ea9 Mon Sep 17 00:00:00 2001 From: fit2bot <68588906+fit2bot@users.noreply.github.com> Date: Sat, 11 May 2024 14:45:29 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B4=A6=E5=8F=B7=E5=AF=86=E9=92=A5?= =?UTF-8?q?=E9=95=BF=E5=BA=A6=E4=B8=BA8192=E6=97=B6=20=E5=88=B7=E6=96=B0?= =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E5=88=97=E8=A1=A8504=20(#13196)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: feng <1304903146@qq.com> --- apps/accounts/serializers/account/account.py | 3 +++ apps/accounts/serializers/account/base.py | 5 ++--- apps/accounts/serializers/account/template.py | 4 ++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/apps/accounts/serializers/account/account.py b/apps/accounts/serializers/account/account.py index 2230c8e92..c15bc0305 100644 --- a/apps/accounts/serializers/account/account.py +++ b/apps/accounts/serializers/account/account.py @@ -431,8 +431,11 @@ class AssetAccountBulkSerializer( class AccountSecretSerializer(SecretReadableMixin, AccountSerializer): class Meta(AccountSerializer.Meta): + fields = AccountSerializer.Meta.fields + ['spec_info'] extra_kwargs = { + **AccountSerializer.Meta.extra_kwargs, 'secret': {'write_only': False}, + 'spec_info': {'label': _('Spec info')}, } diff --git a/apps/accounts/serializers/account/base.py b/apps/accounts/serializers/account/base.py index 23dec0d3e..9de35eb8c 100644 --- a/apps/accounts/serializers/account/base.py +++ b/apps/accounts/serializers/account/base.py @@ -67,15 +67,14 @@ class BaseAccountSerializer(AuthValidateMixin, ResourceLabelsMixin, BulkOrgResou fields_mini = ['id', 'name', 'username'] fields_small = fields_mini + [ 'secret_type', 'secret', 'passphrase', - 'privileged', 'is_active', 'spec_info', + 'privileged', 'is_active', ] fields_other = ['created_by', 'date_created', 'date_updated', 'comment'] fields = fields_small + fields_other + ['labels'] read_only_fields = [ - 'spec_info', 'date_verified', 'created_by', 'date_created', + 'date_verified', 'created_by', 'date_created', ] extra_kwargs = { - 'spec_info': {'label': _('Spec info')}, 'username': {'help_text': _( "Tip: If no username is required for authentication, fill in `null`, " "If AD account, like `username@domain`" diff --git a/apps/accounts/serializers/account/template.py b/apps/accounts/serializers/account/template.py index ea302c3fd..fc6ccefeb 100644 --- a/apps/accounts/serializers/account/template.py +++ b/apps/accounts/serializers/account/template.py @@ -35,6 +35,7 @@ class AccountTemplateSerializer(BaseAccountSerializer): 'su_from' ] extra_kwargs = { + **BaseAccountSerializer.Meta.extra_kwargs, 'secret_strategy': {'help_text': _('Secret generation strategy for account creation')}, 'auto_push': {'help_text': _('Whether to automatically push the account to the asset')}, 'platforms': { @@ -64,6 +65,9 @@ class AccountTemplateSerializer(BaseAccountSerializer): class AccountTemplateSecretSerializer(SecretReadableMixin, AccountTemplateSerializer): class Meta(AccountTemplateSerializer.Meta): + fields = AccountTemplateSerializer.Meta.fields + ['spec_info'] extra_kwargs = { + **AccountTemplateSerializer.Meta.extra_kwargs, 'secret': {'write_only': False}, + 'spec_info': {'label': _('Spec info')}, }