From 0a374db60685cdc54413d930c55dc795e11057cf Mon Sep 17 00:00:00 2001 From: "Jiangjie.Bai" Date: Thu, 23 Feb 2023 19:14:58 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=20{"":=20True"}=20=E9=97=AE=E9=A2=98=20(#972?= =?UTF-8?q?9)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/serializers/asset/common.py | 1 + apps/assets/serializers/asset/host.py | 2 +- apps/common/drf/renders/base.py | 2 ++ apps/locale/ja/LC_MESSAGES/django.po | 41 ++++++++++++++----------- apps/locale/zh/LC_MESSAGES/django.po | 41 ++++++++++++++----------- 5 files changed, 50 insertions(+), 37 deletions(-) diff --git a/apps/assets/serializers/asset/common.py b/apps/assets/serializers/asset/common.py index 01a8bc7b8..1dc6aa28d 100644 --- a/apps/assets/serializers/asset/common.py +++ b/apps/assets/serializers/asset/common.py @@ -139,6 +139,7 @@ class AssetSerializer(BulkOrgResourceModelSerializer, WritableNestedModelSeriali ] fields = fields_small + fields_fk + fields_m2m + read_only_fields extra_kwargs = { + 'auto_info': {'label': _('Auto info')}, 'name': {'label': _("Name")}, 'address': {'label': _('Address')}, 'nodes_display': {'label': _('Node path')}, diff --git a/apps/assets/serializers/asset/host.py b/apps/assets/serializers/asset/host.py index 10b06dc20..6a733c1e3 100644 --- a/apps/assets/serializers/asset/host.py +++ b/apps/assets/serializers/asset/host.py @@ -25,7 +25,7 @@ class HostInfoSerializer(serializers.Serializer): class HostSerializer(AssetSerializer): - info = HostInfoSerializer(required=False) + info = HostInfoSerializer(required=False, label=_('Info')) class Meta(AssetSerializer.Meta): model = Host diff --git a/apps/common/drf/renders/base.py b/apps/common/drf/renders/base.py index 06867ce79..8e1373b9d 100644 --- a/apps/common/drf/renders/base.py +++ b/apps/common/drf/renders/base.py @@ -75,6 +75,8 @@ class BaseFileRenderer(BaseRenderer): value = item.get(field.field_name) if value is None: value = '' + elif isinstance(value, dict): + value = json.dumps(value, ensure_ascii=False) else: value = str(value) row.append(value) diff --git a/apps/locale/ja/LC_MESSAGES/django.po b/apps/locale/ja/LC_MESSAGES/django.po index e3550e3b3..c5cda4241 100644 --- a/apps/locale/ja/LC_MESSAGES/django.po +++ b/apps/locale/ja/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-02-23 18:12+0800\n" +"POT-Creation-Date: 2023-02-23 19:11+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -165,7 +165,7 @@ msgstr "作成のみ" #: accounts/serializers/automations/change_secret.py:111 #: accounts/serializers/automations/change_secret.py:131 #: acls/models/base.py:100 acls/serializers/base.py:56 -#: assets/models/asset/common.py:92 assets/models/asset/common.py:279 +#: assets/models/asset/common.py:92 assets/models/asset/common.py:280 #: assets/models/cmd_filter.py:36 assets/serializers/domain.py:19 #: assets/serializers/label.py:27 audits/models.py:48 #: authentication/models/connection_token.py:33 @@ -446,7 +446,7 @@ msgstr "アカウントの確認" #: assets/models/cmd_filter.py:21 assets/models/domain.py:18 #: assets/models/group.py:20 assets/models/label.py:18 #: assets/models/platform.py:21 assets/models/platform.py:76 -#: assets/serializers/asset/common.py:67 assets/serializers/asset/common.py:142 +#: assets/serializers/asset/common.py:67 assets/serializers/asset/common.py:143 #: assets/serializers/platform.py:91 assets/serializers/platform.py:136 #: authentication/serializers/connect_token_secret.py:103 ops/mixin.py:21 #: ops/models/adhoc.py:21 ops/models/celery.py:15 ops/models/celery.py:57 @@ -592,7 +592,7 @@ msgid "Key password" msgstr "キーパスワード" #: accounts/serializers/account/base.py:79 -#: assets/serializers/asset/common.py:290 +#: assets/serializers/asset/common.py:291 msgid "Spec info" msgstr "特別情報" @@ -1175,7 +1175,7 @@ msgstr "クラウド サービス" msgid "Port" msgstr "ポート" -#: assets/models/asset/common.py:103 assets/serializers/asset/common.py:143 +#: assets/models/asset/common.py:103 assets/serializers/asset/common.py:144 msgid "Address" msgstr "アドレス" @@ -1196,19 +1196,19 @@ msgstr "ドメイン" msgid "Labels" msgstr "ラベル" -#: assets/models/asset/common.py:282 +#: assets/models/asset/common.py:283 msgid "Can refresh asset hardware info" msgstr "資産ハードウェア情報を更新できます" -#: assets/models/asset/common.py:283 +#: assets/models/asset/common.py:284 msgid "Can test asset connectivity" msgstr "資産接続をテストできます" -#: assets/models/asset/common.py:284 +#: assets/models/asset/common.py:285 msgid "Can match asset" msgstr "アセットを一致させることができます" -#: assets/models/asset/common.py:285 +#: assets/models/asset/common.py:286 msgid "Can change asset nodes" msgstr "資産ノードを変更できます" @@ -1253,7 +1253,7 @@ msgid "Submit selector" msgstr "ボタンセレクターを確認する" #: assets/models/automations/base.py:17 assets/models/cmd_filter.py:38 -#: assets/serializers/asset/common.py:289 rbac/tree.py:35 +#: assets/serializers/asset/common.py:290 rbac/tree.py:35 msgid "Accounts" msgstr "アカウント" @@ -1495,26 +1495,27 @@ msgstr "自動充填" msgid "Protocols" msgstr "プロトコル" -#: assets/serializers/asset/common.py:144 +#: assets/serializers/asset/common.py:142 +#: assets/serializers/asset/common.py:292 +msgid "Auto info" +msgstr "自動情報" + +#: assets/serializers/asset/common.py:145 msgid "Node path" msgstr "ノードパスです" -#: assets/serializers/asset/common.py:217 +#: assets/serializers/asset/common.py:218 msgid "Platform not exist" msgstr "プラットフォームが存在しません" -#: assets/serializers/asset/common.py:252 +#: assets/serializers/asset/common.py:253 msgid "port out of range (1-65535)" msgstr "ポート番号が範囲外です (1-65535)" -#: assets/serializers/asset/common.py:259 +#: assets/serializers/asset/common.py:260 msgid "Protocol is required: {}" msgstr "プロトコルが必要です: {}" -#: assets/serializers/asset/common.py:291 -msgid "Auto info" -msgstr "自動情報" - #: assets/serializers/asset/database.py:25 common/serializers/fields.py:100 #: tickets/serializers/ticket/common.py:58 #: xpack/plugins/cloud/serializers/account_attrs.py:56 @@ -1572,6 +1573,10 @@ msgstr "システムバージョン" msgid "OS arch" msgstr "システムアーキテクチャ" +#: assets/serializers/asset/host.py:28 +msgid "Info" +msgstr "情報" + #: assets/serializers/cagegory.py:9 msgid "Constraints" msgstr "制約" diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index b282e761a..b8db40723 100644 --- a/apps/locale/zh/LC_MESSAGES/django.po +++ b/apps/locale/zh/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: JumpServer 0.3.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-02-23 18:12+0800\n" +"POT-Creation-Date: 2023-02-23 19:11+0800\n" "PO-Revision-Date: 2021-05-20 10:54+0800\n" "Last-Translator: ibuler \n" "Language-Team: JumpServer team\n" @@ -164,7 +164,7 @@ msgstr "仅创建" #: accounts/serializers/automations/change_secret.py:111 #: accounts/serializers/automations/change_secret.py:131 #: acls/models/base.py:100 acls/serializers/base.py:56 -#: assets/models/asset/common.py:92 assets/models/asset/common.py:279 +#: assets/models/asset/common.py:92 assets/models/asset/common.py:280 #: assets/models/cmd_filter.py:36 assets/serializers/domain.py:19 #: assets/serializers/label.py:27 audits/models.py:48 #: authentication/models/connection_token.py:33 @@ -445,7 +445,7 @@ msgstr "账号验证" #: assets/models/cmd_filter.py:21 assets/models/domain.py:18 #: assets/models/group.py:20 assets/models/label.py:18 #: assets/models/platform.py:21 assets/models/platform.py:76 -#: assets/serializers/asset/common.py:67 assets/serializers/asset/common.py:142 +#: assets/serializers/asset/common.py:67 assets/serializers/asset/common.py:143 #: assets/serializers/platform.py:91 assets/serializers/platform.py:136 #: authentication/serializers/connect_token_secret.py:103 ops/mixin.py:21 #: ops/models/adhoc.py:21 ops/models/celery.py:15 ops/models/celery.py:57 @@ -588,7 +588,7 @@ msgid "Key password" msgstr "密钥密码" #: accounts/serializers/account/base.py:79 -#: assets/serializers/asset/common.py:290 +#: assets/serializers/asset/common.py:291 msgid "Spec info" msgstr "特殊信息" @@ -1167,7 +1167,7 @@ msgstr "云服务" msgid "Port" msgstr "端口" -#: assets/models/asset/common.py:103 assets/serializers/asset/common.py:143 +#: assets/models/asset/common.py:103 assets/serializers/asset/common.py:144 msgid "Address" msgstr "地址" @@ -1188,19 +1188,19 @@ msgstr "网域" msgid "Labels" msgstr "标签管理" -#: assets/models/asset/common.py:282 +#: assets/models/asset/common.py:283 msgid "Can refresh asset hardware info" msgstr "可以更新资产硬件信息" -#: assets/models/asset/common.py:283 +#: assets/models/asset/common.py:284 msgid "Can test asset connectivity" msgstr "可以测试资产连接性" -#: assets/models/asset/common.py:284 +#: assets/models/asset/common.py:285 msgid "Can match asset" msgstr "可以匹配资产" -#: assets/models/asset/common.py:285 +#: assets/models/asset/common.py:286 msgid "Can change asset nodes" msgstr "可以修改资产节点" @@ -1245,7 +1245,7 @@ msgid "Submit selector" msgstr "确认按钮选择器" #: assets/models/automations/base.py:17 assets/models/cmd_filter.py:38 -#: assets/serializers/asset/common.py:289 rbac/tree.py:35 +#: assets/serializers/asset/common.py:290 rbac/tree.py:35 msgid "Accounts" msgstr "账号管理" @@ -1487,26 +1487,27 @@ msgstr "自动代填" msgid "Protocols" msgstr "协议组" -#: assets/serializers/asset/common.py:144 +#: assets/serializers/asset/common.py:142 +#: assets/serializers/asset/common.py:292 +msgid "Auto info" +msgstr "自动化信息" + +#: assets/serializers/asset/common.py:145 msgid "Node path" msgstr "节点路径" -#: assets/serializers/asset/common.py:217 +#: assets/serializers/asset/common.py:218 msgid "Platform not exist" msgstr "平台不存在" -#: assets/serializers/asset/common.py:252 +#: assets/serializers/asset/common.py:253 msgid "port out of range (1-65535)" msgstr "端口超出范围 (1-65535)" -#: assets/serializers/asset/common.py:259 +#: assets/serializers/asset/common.py:260 msgid "Protocol is required: {}" msgstr "协议是必填的: {}" -#: assets/serializers/asset/common.py:291 -msgid "Auto info" -msgstr "自动化信息" - #: assets/serializers/asset/database.py:25 common/serializers/fields.py:100 #: tickets/serializers/ticket/common.py:58 #: xpack/plugins/cloud/serializers/account_attrs.py:56 @@ -1564,6 +1565,10 @@ msgstr "系统版本" msgid "OS arch" msgstr "系统架构" +#: assets/serializers/asset/host.py:28 +msgid "Info" +msgstr "信息" + #: assets/serializers/cagegory.py:9 msgid "Constraints" msgstr "约束"