mirror of https://github.com/jumpserver/jumpserver
fix: 修复添加资产到节点，移除资产从节点，移动资产到节点 API rbac 权限位
Bai
Jiangjie.Bai
parent
71f3fe64b4
commit
770e7733e7
|
|
@ -11,6 +11,7 @@ from rest_framework.response import Response
|
||||||
from rest_framework.serializers import ValidationError
|
from rest_framework.serializers import ValidationError
|
||||||
|
|
||||||
from assets.models import Asset
|
from assets.models import Asset
|
||||||
|
from rbac.permissions import RBACPermission
|
||||||
from common.api import SuggestionMixin
|
from common.api import SuggestionMixin
|
||||||
from common.const.http import POST
|
from common.const.http import POST
|
||||||
from common.const.signals import PRE_REMOVE, POST_REMOVE
|
from common.const.signals import PRE_REMOVE, POST_REMOVE
|
||||||
|
|
@ -27,6 +28,7 @@ from ..tasks import (
|
||||||
check_node_assets_amount_task
|
check_node_assets_amount_task
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
logger = get_logger(__file__)
|
logger = get_logger(__file__)
|
||||||
__all__ = [
|
__all__ = [
|
||||||
'NodeViewSet', 'NodeAssetsApi', 'NodeAddAssetsApi',
|
'NodeViewSet', 'NodeAssetsApi', 'NodeAddAssetsApi',
|
||||||
|
|
@ -100,6 +102,10 @@ class NodeAddAssetsApi(generics.UpdateAPIView):
|
||||||
model = Node
|
model = Node
|
||||||
serializer_class = serializers.NodeAssetsSerializer
|
serializer_class = serializers.NodeAssetsSerializer
|
||||||
instance = None
|
instance = None
|
||||||
|
permission_classes = (RBACPermission,)
|
||||||
|
rbac_perms = {
|
||||||
|
'PUT': 'assets.add_assettonode',
|
||||||
|
}
|
||||||
|
|
||||||
def perform_update(self, serializer):
|
def perform_update(self, serializer):
|
||||||
assets = serializer.validated_data.get('assets')
|
assets = serializer.validated_data.get('assets')
|
||||||
|
|
@ -111,6 +117,10 @@ class NodeRemoveAssetsApi(generics.UpdateAPIView):
|
||||||
model = Node
|
model = Node
|
||||||
serializer_class = serializers.NodeAssetsSerializer
|
serializer_class = serializers.NodeAssetsSerializer
|
||||||
instance = None
|
instance = None
|
||||||
|
permission_classes = (RBACPermission,)
|
||||||
|
rbac_perms = {
|
||||||
|
'PUT': 'assets.remove_assetfromnode',
|
||||||
|
}
|
||||||
|
|
||||||
def perform_update(self, serializer):
|
def perform_update(self, serializer):
|
||||||
assets = serializer.validated_data.get('assets')
|
assets = serializer.validated_data.get('assets')
|
||||||
|
|
@ -129,6 +139,10 @@ class MoveAssetsToNodeApi(generics.UpdateAPIView):
|
||||||
model = Node
|
model = Node
|
||||||
serializer_class = serializers.NodeAssetsSerializer
|
serializer_class = serializers.NodeAssetsSerializer
|
||||||
instance = None
|
instance = None
|
||||||
|
permission_classes = (RBACPermission,)
|
||||||
|
rbac_perms = {
|
||||||
|
'PUT': 'assets.move_assettonode',
|
||||||
|
}
|
||||||
|
|
||||||
def perform_update(self, serializer):
|
def perform_update(self, serializer):
|
||||||
assets = serializer.validated_data.get('assets')
|
assets = serializer.validated_data.get('assets')
|
||||||
|
|
|
||||||
|
|
@ -289,4 +289,5 @@ class Asset(NodesRelationMixin, AbsConnectivity, JMSOrgBaseModel):
|
||||||
('match_asset', _('Can match asset')),
|
('match_asset', _('Can match asset')),
|
||||||
('add_assettonode', _('Add asset to node')),
|
('add_assettonode', _('Add asset to node')),
|
||||||
('move_assettonode', _('Move asset to node')),
|
('move_assettonode', _('Move asset to node')),
|
||||||
|
('remove_assetfromnode', _('Remove asset from node'))
|
||||||
]
|
]
|
||||||
|
|
|
||||||
|
|
@ -184,7 +184,7 @@ def merge_delay_run(ttl=5, key=None):
|
||||||
elif isinstance(v, set):
|
elif isinstance(v, set):
|
||||||
cache_kwargs[k] = cache_kwargs[k].union(v)
|
cache_kwargs[k] = cache_kwargs[k].union(v)
|
||||||
else:
|
else:
|
||||||
cache_kwargs[k] += v
|
cache_kwargs[k] = list(cache_kwargs[k]) + list(v)
|
||||||
_loop_debouncer_func_args_cache[cache_key] = cache_kwargs
|
_loop_debouncer_func_args_cache[cache_key] = cache_kwargs
|
||||||
run_debouncer_func(cache_key, org, ttl, func, *args, **cache_kwargs)
|
run_debouncer_func(cache_key, org, ttl, func, *args, **cache_kwargs)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: PACKAGE VERSION\n"
|
"Project-Id-Version: PACKAGE VERSION\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
"POT-Creation-Date: 2023-02-13 15:27+0800\n"
|
"POT-Creation-Date: 2023-02-14 15:32+0800\n"
|
||||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||||
|
|
@ -243,7 +243,7 @@ msgstr "アカウントバックアップ計画"
|
||||||
|
|
||||||
#: accounts/models/automations/backup_account.py:77
|
#: accounts/models/automations/backup_account.py:77
|
||||||
#: assets/models/automations/base.py:106 audits/models.py:43
|
#: assets/models/automations/base.py:106 audits/models.py:43
|
||||||
#: ops/models/base.py:55 ops/models/celery.py:63 ops/models/job.py:113
|
#: ops/models/base.py:55 ops/models/celery.py:63 ops/models/job.py:114
|
||||||
#: perms/models/asset_permission.py:72 terminal/models/applet/host.py:108
|
#: perms/models/asset_permission.py:72 terminal/models/applet/host.py:108
|
||||||
#: terminal/models/session/session.py:43
|
#: terminal/models/session/session.py:43
|
||||||
#: tickets/models/ticket/apply_application.py:30
|
#: tickets/models/ticket/apply_application.py:30
|
||||||
|
|
@ -277,7 +277,7 @@ msgstr "理由"
|
||||||
#: accounts/models/automations/backup_account.py:93
|
#: accounts/models/automations/backup_account.py:93
|
||||||
#: accounts/serializers/automations/change_secret.py:106
|
#: accounts/serializers/automations/change_secret.py:106
|
||||||
#: accounts/serializers/automations/change_secret.py:129
|
#: accounts/serializers/automations/change_secret.py:129
|
||||||
#: ops/serializers/job.py:54 terminal/serializers/session.py:49
|
#: ops/serializers/job.py:64 terminal/serializers/session.py:49
|
||||||
msgid "Is success"
|
msgid "Is success"
|
||||||
msgstr "成功は"
|
msgstr "成功は"
|
||||||
|
|
||||||
|
|
@ -365,7 +365,7 @@ msgstr "開始日"
|
||||||
|
|
||||||
#: accounts/models/automations/change_secret.py:74
|
#: accounts/models/automations/change_secret.py:74
|
||||||
#: assets/models/automations/base.py:107 ops/models/base.py:56
|
#: assets/models/automations/base.py:107 ops/models/base.py:56
|
||||||
#: ops/models/celery.py:64 ops/models/job.py:114
|
#: ops/models/celery.py:64 ops/models/job.py:115
|
||||||
#: terminal/models/applet/host.py:109
|
#: terminal/models/applet/host.py:109
|
||||||
msgid "Date finished"
|
msgid "Date finished"
|
||||||
msgstr "終了日"
|
msgstr "終了日"
|
||||||
|
|
@ -427,9 +427,9 @@ msgstr "アカウントの確認"
|
||||||
#: assets/serializers/asset/common.py:63 assets/serializers/asset/common.py:137
|
#: assets/serializers/asset/common.py:63 assets/serializers/asset/common.py:137
|
||||||
#: assets/serializers/platform.py:128
|
#: assets/serializers/platform.py:128
|
||||||
#: authentication/serializers/connect_token_secret.py:103 ops/mixin.py:20
|
#: authentication/serializers/connect_token_secret.py:103 ops/mixin.py:20
|
||||||
#: ops/models/adhoc.py:22 ops/models/celery.py:15 ops/models/celery.py:57
|
#: ops/models/adhoc.py:21 ops/models/celery.py:15 ops/models/celery.py:57
|
||||||
#: ops/models/job.py:24 ops/models/playbook.py:15 orgs/models.py:69
|
#: ops/models/job.py:24 ops/models/playbook.py:22 ops/serializers/job.py:19
|
||||||
#: perms/models/asset_permission.py:56 rbac/models/role.py:29
|
#: orgs/models.py:69 perms/models/asset_permission.py:56 rbac/models/role.py:29
|
||||||
#: settings/models.py:33 settings/serializers/sms.py:6
|
#: settings/models.py:33 settings/serializers/sms.py:6
|
||||||
#: terminal/models/applet/applet.py:26 terminal/models/component/endpoint.py:12
|
#: terminal/models/applet/applet.py:26 terminal/models/component/endpoint.py:12
|
||||||
#: terminal/models/component/endpoint.py:90
|
#: terminal/models/component/endpoint.py:90
|
||||||
|
|
@ -581,7 +581,7 @@ msgstr "キー/パスワード"
|
||||||
msgid "Key password"
|
msgid "Key password"
|
||||||
msgstr "キーパスワード"
|
msgstr "キーパスワード"
|
||||||
|
|
||||||
#: accounts/serializers/account/base.py:80
|
#: accounts/serializers/account/base.py:81
|
||||||
#: assets/serializers/asset/common.py:280
|
#: assets/serializers/asset/common.py:280
|
||||||
msgid "Spec info"
|
msgid "Spec info"
|
||||||
msgstr "特別情報"
|
msgstr "特別情報"
|
||||||
|
|
@ -738,7 +738,7 @@ msgid "User"
|
||||||
msgstr "ユーザー"
|
msgstr "ユーザー"
|
||||||
|
|
||||||
#: acls/models/command_acl.py:16 assets/models/cmd_filter.py:60
|
#: acls/models/command_acl.py:16 assets/models/cmd_filter.py:60
|
||||||
#: ops/serializers/job.py:53 terminal/models/session/session.py:41
|
#: ops/serializers/job.py:63 terminal/models/session/session.py:41
|
||||||
#: terminal/serializers/command.py:17 terminal/serializers/session.py:19
|
#: terminal/serializers/command.py:17 terminal/serializers/session.py:19
|
||||||
#: terminal/templates/terminal/_msg_command_alert.html:12
|
#: terminal/templates/terminal/_msg_command_alert.html:12
|
||||||
#: terminal/templates/terminal/_msg_command_execute_alert.html:10
|
#: terminal/templates/terminal/_msg_command_execute_alert.html:10
|
||||||
|
|
@ -919,15 +919,15 @@ msgstr ""
|
||||||
msgid "Number required"
|
msgid "Number required"
|
||||||
msgstr "必要な数"
|
msgstr "必要な数"
|
||||||
|
|
||||||
#: assets/api/node.py:56
|
#: assets/api/node.py:58
|
||||||
msgid "You can't update the root node name"
|
msgid "You can't update the root node name"
|
||||||
msgstr "ルートノード名を更新できません"
|
msgstr "ルートノード名を更新できません"
|
||||||
|
|
||||||
#: assets/api/node.py:63
|
#: assets/api/node.py:65
|
||||||
msgid "You can't delete the root node ({})"
|
msgid "You can't delete the root node ({})"
|
||||||
msgstr "ルートノード ({}) を削除できません。"
|
msgstr "ルートノード ({}) を削除できません。"
|
||||||
|
|
||||||
#: assets/api/node.py:66
|
#: assets/api/node.py:68
|
||||||
msgid "Deletion failed and the node contains assets"
|
msgid "Deletion failed and the node contains assets"
|
||||||
msgstr "削除に失敗し、ノードにアセットが含まれています。"
|
msgstr "削除に失敗し、ノードにアセットが含まれています。"
|
||||||
|
|
||||||
|
|
@ -1055,8 +1055,8 @@ msgstr "SSHパブリックキー"
|
||||||
|
|
||||||
#: assets/models/_user.py:27 assets/models/cmd_filter.py:40
|
#: assets/models/_user.py:27 assets/models/cmd_filter.py:40
|
||||||
#: assets/models/cmd_filter.py:88 assets/models/group.py:23
|
#: assets/models/cmd_filter.py:88 assets/models/group.py:23
|
||||||
#: assets/models/platform.py:79 common/db/models.py:37 ops/models/adhoc.py:28
|
#: assets/models/platform.py:79 common/db/models.py:37 ops/models/adhoc.py:27
|
||||||
#: ops/models/job.py:40 ops/models/playbook.py:18 rbac/models/role.py:37
|
#: ops/models/job.py:40 ops/models/playbook.py:25 rbac/models/role.py:37
|
||||||
#: settings/models.py:38 terminal/models/applet/applet.py:35
|
#: settings/models.py:38 terminal/models/applet/applet.py:35
|
||||||
#: terminal/models/applet/applet.py:151 terminal/models/applet/host.py:110
|
#: terminal/models/applet/applet.py:151 terminal/models/applet/host.py:110
|
||||||
#: terminal/models/component/endpoint.py:24
|
#: terminal/models/component/endpoint.py:24
|
||||||
|
|
@ -1069,7 +1069,7 @@ msgstr "コメント"
|
||||||
|
|
||||||
#: assets/models/_user.py:28 assets/models/automations/base.py:105
|
#: assets/models/_user.py:28 assets/models/automations/base.py:105
|
||||||
#: assets/models/cmd_filter.py:41 assets/models/group.py:22
|
#: assets/models/cmd_filter.py:41 assets/models/group.py:22
|
||||||
#: common/db/models.py:35 ops/models/base.py:54 ops/models/job.py:112
|
#: common/db/models.py:35 ops/models/base.py:54 ops/models/job.py:113
|
||||||
#: users/models/user.py:943
|
#: users/models/user.py:943
|
||||||
msgid "Date created"
|
msgid "Date created"
|
||||||
msgstr "作成された日付"
|
msgstr "作成された日付"
|
||||||
|
|
@ -1206,6 +1206,10 @@ msgstr "ノードにアセットを追加する"
|
||||||
msgid "Move asset to node"
|
msgid "Move asset to node"
|
||||||
msgstr "アセットをノードに移動する"
|
msgstr "アセットをノードに移動する"
|
||||||
|
|
||||||
|
#: assets/models/asset/common.py:292
|
||||||
|
msgid "Remove asset from node"
|
||||||
|
msgstr "ノードからアセットを削除"
|
||||||
|
|
||||||
#: assets/models/asset/database.py:10 assets/serializers/asset/common.py:105
|
#: assets/models/asset/database.py:10 assets/serializers/asset/common.py:105
|
||||||
#: settings/serializers/email.py:37
|
#: settings/serializers/email.py:37
|
||||||
msgid "Use SSL"
|
msgid "Use SSL"
|
||||||
|
|
@ -1261,7 +1265,7 @@ msgid "Asset automation task"
|
||||||
msgstr "アセットの自動化タスク"
|
msgstr "アセットの自動化タスク"
|
||||||
|
|
||||||
#: assets/models/automations/base.py:104 audits/models.py:163
|
#: assets/models/automations/base.py:104 audits/models.py:163
|
||||||
#: audits/serializers.py:50 ops/models/base.py:49 ops/models/job.py:105
|
#: audits/serializers.py:50 ops/models/base.py:49 ops/models/job.py:106
|
||||||
#: terminal/models/applet/applet.py:150 terminal/models/applet/host.py:107
|
#: terminal/models/applet/applet.py:150 terminal/models/applet/host.py:107
|
||||||
#: terminal/models/component/status.py:27 terminal/serializers/applet.py:17
|
#: terminal/models/component/status.py:27 terminal/serializers/applet.py:17
|
||||||
#: terminal/serializers/applet_host.py:93 tickets/models/ticket/general.py:283
|
#: terminal/serializers/applet_host.py:93 tickets/models/ticket/general.py:283
|
||||||
|
|
@ -1666,6 +1670,12 @@ msgstr "ノードの下にあるアセットの数を定期的に確認する"
|
||||||
msgid "Test if the assets under the node are connectable "
|
msgid "Test if the assets under the node are connectable "
|
||||||
msgstr "ノード配下のアセットが接続できるかテストする"
|
msgstr "ノード配下のアセットが接続できるかテストする"
|
||||||
|
|
||||||
|
#: assets/tasks/ping_gateway.py:23 assets/tasks/ping_gateway.py:33
|
||||||
|
#, fuzzy
|
||||||
|
#| msgid "Test assets connectivity "
|
||||||
|
msgid "Test gateways connectivity "
|
||||||
|
msgstr "アセット接続のテスト。"
|
||||||
|
|
||||||
#: assets/tasks/utils.py:17
|
#: assets/tasks/utils.py:17
|
||||||
msgid "Asset has been disabled, skipped: {}"
|
msgid "Asset has been disabled, skipped: {}"
|
||||||
msgstr "資産が無効化されました。スキップ: {}"
|
msgstr "資産が無効化されました。スキップ: {}"
|
||||||
|
|
@ -3186,15 +3196,15 @@ msgstr "システムメッセージ"
|
||||||
msgid "Publish the station message"
|
msgid "Publish the station message"
|
||||||
msgstr "投稿サイトニュース"
|
msgstr "投稿サイトニュース"
|
||||||
|
|
||||||
#: ops/ansible/inventory.py:76
|
#: ops/ansible/inventory.py:77
|
||||||
msgid "No account available"
|
msgid "No account available"
|
||||||
msgstr "利用可能なアカウントがありません"
|
msgstr "利用可能なアカウントがありません"
|
||||||
|
|
||||||
#: ops/ansible/inventory.py:182
|
#: ops/ansible/inventory.py:186
|
||||||
msgid "Ansible disabled"
|
msgid "Ansible disabled"
|
||||||
msgstr "Ansible 無効"
|
msgstr "Ansible 無効"
|
||||||
|
|
||||||
#: ops/ansible/inventory.py:198
|
#: ops/ansible/inventory.py:202
|
||||||
msgid "Skip hosts below:"
|
msgid "Skip hosts below:"
|
||||||
msgstr "次のホストをスキップします: "
|
msgstr "次のホストをスキップします: "
|
||||||
|
|
||||||
|
|
@ -3299,21 +3309,21 @@ msgstr "{} から {} までの範囲"
|
||||||
msgid "Require periodic or regularly perform setting"
|
msgid "Require periodic or regularly perform setting"
|
||||||
msgstr "定期的または定期的に設定を行う必要があります"
|
msgstr "定期的または定期的に設定を行う必要があります"
|
||||||
|
|
||||||
#: ops/models/adhoc.py:23
|
#: ops/models/adhoc.py:22
|
||||||
msgid "Pattern"
|
msgid "Pattern"
|
||||||
msgstr "パターン"
|
msgstr "パターン"
|
||||||
|
|
||||||
#: ops/models/adhoc.py:25 ops/models/job.py:28
|
#: ops/models/adhoc.py:24 ops/models/job.py:28
|
||||||
msgid "Module"
|
msgid "Module"
|
||||||
msgstr "モジュール"
|
msgstr "モジュール"
|
||||||
|
|
||||||
#: ops/models/adhoc.py:26 ops/models/celery.py:58 ops/models/job.py:26
|
#: ops/models/adhoc.py:25 ops/models/celery.py:58 ops/models/job.py:26
|
||||||
#: terminal/models/component/task.py:16
|
#: terminal/models/component/task.py:16
|
||||||
msgid "Args"
|
msgid "Args"
|
||||||
msgstr "アルグ"
|
msgstr "アルグ"
|
||||||
|
|
||||||
#: ops/models/adhoc.py:27 ops/models/base.py:16 ops/models/base.py:53
|
#: ops/models/adhoc.py:26 ops/models/base.py:16 ops/models/base.py:53
|
||||||
#: ops/models/job.py:33 ops/models/job.py:111 ops/models/playbook.py:17
|
#: ops/models/job.py:33 ops/models/job.py:112 ops/models/playbook.py:24
|
||||||
#: terminal/models/session/sharing.py:23
|
#: terminal/models/session/sharing.py:23
|
||||||
msgid "Creator"
|
msgid "Creator"
|
||||||
msgstr "作成者"
|
msgstr "作成者"
|
||||||
|
|
@ -3330,16 +3340,16 @@ msgstr "アカウント ポリシー"
|
||||||
msgid "Last execution"
|
msgid "Last execution"
|
||||||
msgstr "最後の実行"
|
msgstr "最後の実行"
|
||||||
|
|
||||||
#: ops/models/base.py:22 ops/serializers/job.py:16
|
#: ops/models/base.py:22 ops/serializers/job.py:18
|
||||||
msgid "Date last run"
|
msgid "Date last run"
|
||||||
msgstr "最終実行日"
|
msgstr "最終実行日"
|
||||||
|
|
||||||
#: ops/models/base.py:51 ops/models/job.py:109
|
#: ops/models/base.py:51 ops/models/job.py:110
|
||||||
#: xpack/plugins/cloud/models.py:162
|
#: xpack/plugins/cloud/models.py:162
|
||||||
msgid "Result"
|
msgid "Result"
|
||||||
msgstr "結果"
|
msgstr "結果"
|
||||||
|
|
||||||
#: ops/models/base.py:52 ops/models/job.py:110
|
#: ops/models/base.py:52 ops/models/job.py:111
|
||||||
msgid "Summary"
|
msgid "Summary"
|
||||||
msgstr "概要"
|
msgstr "概要"
|
||||||
|
|
||||||
|
|
@ -3407,31 +3417,31 @@ msgstr "パラメータ定義"
|
||||||
msgid "Job"
|
msgid "Job"
|
||||||
msgstr "ジョブ＃ジョブ＃"
|
msgstr "ジョブ＃ジョブ＃"
|
||||||
|
|
||||||
#: ops/models/job.py:108
|
#: ops/models/job.py:109
|
||||||
msgid "Parameters"
|
msgid "Parameters"
|
||||||
msgstr "パラメータ"
|
msgstr "パラメータ"
|
||||||
|
|
||||||
#: ops/models/job.py:116
|
#: ops/models/job.py:117
|
||||||
msgid "Material"
|
msgid "Material"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ops/models/job.py:118
|
#: ops/models/job.py:119
|
||||||
msgid "Material Type"
|
msgid "Material Type"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ops/models/job.py:311
|
#: ops/models/job.py:322
|
||||||
msgid "Job Execution"
|
msgid "Job Execution"
|
||||||
msgstr "ジョブ実行"
|
msgstr "ジョブ実行"
|
||||||
|
|
||||||
#: ops/models/job.py:322
|
#: ops/models/job.py:333
|
||||||
msgid "Job audit log"
|
msgid "Job audit log"
|
||||||
msgstr "ジョブ監査ログ"
|
msgstr "ジョブ監査ログ"
|
||||||
|
|
||||||
#: ops/models/playbook.py:20
|
#: ops/models/playbook.py:27
|
||||||
msgid "CreateMethod"
|
msgid "CreateMethod"
|
||||||
msgstr "创建方式"
|
msgstr "创建方式"
|
||||||
|
|
||||||
#: ops/models/playbook.py:21
|
#: ops/models/playbook.py:28
|
||||||
msgid "VCS URL"
|
msgid "VCS URL"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -3463,19 +3473,19 @@ msgstr "{max_threshold}%: => {value} を超える使用メモリ"
|
||||||
msgid "CPU load more than {max_threshold}: => {value}"
|
msgid "CPU load more than {max_threshold}: => {value}"
|
||||||
msgstr "{max_threshold} を超えるCPUロード: => {value}"
|
msgstr "{max_threshold} を超えるCPUロード: => {value}"
|
||||||
|
|
||||||
#: ops/serializers/job.py:14
|
#: ops/serializers/job.py:16
|
||||||
msgid "Run after save"
|
msgid "Run after save"
|
||||||
msgstr "保存後に実行"
|
msgstr "保存後に実行"
|
||||||
|
|
||||||
#: ops/serializers/job.py:52
|
#: ops/serializers/job.py:62
|
||||||
msgid "Job type"
|
msgid "Job type"
|
||||||
msgstr "タスクの種類"
|
msgstr "タスクの種類"
|
||||||
|
|
||||||
#: ops/serializers/job.py:55 terminal/serializers/session.py:53
|
#: ops/serializers/job.py:65 terminal/serializers/session.py:53
|
||||||
msgid "Is finished"
|
msgid "Is finished"
|
||||||
msgstr "終了しました"
|
msgstr "終了しました"
|
||||||
|
|
||||||
#: ops/serializers/job.py:56
|
#: ops/serializers/job.py:66
|
||||||
msgid "Time cost"
|
msgid "Time cost"
|
||||||
msgstr "時を過ごす"
|
msgstr "時を過ごす"
|
||||||
|
|
||||||
|
|
@ -3917,7 +3927,7 @@ msgstr "権限ツリーの表示"
|
||||||
msgid "Test success"
|
msgid "Test success"
|
||||||
msgstr "テストの成功"
|
msgstr "テストの成功"
|
||||||
|
|
||||||
#: settings/api/email.py:20
|
#: settings/api/email.py:21
|
||||||
msgid "Test mail sent to {}, please check"
|
msgid "Test mail sent to {}, please check"
|
||||||
msgstr "{}に送信されたテストメールを確認してください"
|
msgstr "{}に送信されたテストメールを確認してください"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: JumpServer 0.3.3\n"
|
"Project-Id-Version: JumpServer 0.3.3\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
"POT-Creation-Date: 2023-02-13 15:27+0800\n"
|
"POT-Creation-Date: 2023-02-14 15:32+0800\n"
|
||||||
"PO-Revision-Date: 2021-05-20 10:54+0800\n"
|
"PO-Revision-Date: 2021-05-20 10:54+0800\n"
|
||||||
"Last-Translator: ibuler <ibuler@qq.com>\n"
|
"Last-Translator: ibuler <ibuler@qq.com>\n"
|
||||||
"Language-Team: JumpServer team<ibuler@qq.com>\n"
|
"Language-Team: JumpServer team<ibuler@qq.com>\n"
|
||||||
|
|
@ -242,7 +242,7 @@ msgstr "账号备份计划"
|
||||||
|
|
||||||
#: accounts/models/automations/backup_account.py:77
|
#: accounts/models/automations/backup_account.py:77
|
||||||
#: assets/models/automations/base.py:106 audits/models.py:43
|
#: assets/models/automations/base.py:106 audits/models.py:43
|
||||||
#: ops/models/base.py:55 ops/models/celery.py:63 ops/models/job.py:113
|
#: ops/models/base.py:55 ops/models/celery.py:63 ops/models/job.py:114
|
||||||
#: perms/models/asset_permission.py:72 terminal/models/applet/host.py:108
|
#: perms/models/asset_permission.py:72 terminal/models/applet/host.py:108
|
||||||
#: terminal/models/session/session.py:43
|
#: terminal/models/session/session.py:43
|
||||||
#: tickets/models/ticket/apply_application.py:30
|
#: tickets/models/ticket/apply_application.py:30
|
||||||
|
|
@ -276,7 +276,7 @@ msgstr "原因"
|
||||||
#: accounts/models/automations/backup_account.py:93
|
#: accounts/models/automations/backup_account.py:93
|
||||||
#: accounts/serializers/automations/change_secret.py:106
|
#: accounts/serializers/automations/change_secret.py:106
|
||||||
#: accounts/serializers/automations/change_secret.py:129
|
#: accounts/serializers/automations/change_secret.py:129
|
||||||
#: ops/serializers/job.py:54 terminal/serializers/session.py:49
|
#: ops/serializers/job.py:64 terminal/serializers/session.py:49
|
||||||
msgid "Is success"
|
msgid "Is success"
|
||||||
msgstr "是否成功"
|
msgstr "是否成功"
|
||||||
|
|
||||||
|
|
@ -364,7 +364,7 @@ msgstr "开始日期"
|
||||||
|
|
||||||
#: accounts/models/automations/change_secret.py:74
|
#: accounts/models/automations/change_secret.py:74
|
||||||
#: assets/models/automations/base.py:107 ops/models/base.py:56
|
#: assets/models/automations/base.py:107 ops/models/base.py:56
|
||||||
#: ops/models/celery.py:64 ops/models/job.py:114
|
#: ops/models/celery.py:64 ops/models/job.py:115
|
||||||
#: terminal/models/applet/host.py:109
|
#: terminal/models/applet/host.py:109
|
||||||
msgid "Date finished"
|
msgid "Date finished"
|
||||||
msgstr "结束日期"
|
msgstr "结束日期"
|
||||||
|
|
@ -426,9 +426,9 @@ msgstr "账号验证"
|
||||||
#: assets/serializers/asset/common.py:63 assets/serializers/asset/common.py:137
|
#: assets/serializers/asset/common.py:63 assets/serializers/asset/common.py:137
|
||||||
#: assets/serializers/platform.py:128
|
#: assets/serializers/platform.py:128
|
||||||
#: authentication/serializers/connect_token_secret.py:103 ops/mixin.py:20
|
#: authentication/serializers/connect_token_secret.py:103 ops/mixin.py:20
|
||||||
#: ops/models/adhoc.py:22 ops/models/celery.py:15 ops/models/celery.py:57
|
#: ops/models/adhoc.py:21 ops/models/celery.py:15 ops/models/celery.py:57
|
||||||
#: ops/models/job.py:24 ops/models/playbook.py:15 orgs/models.py:69
|
#: ops/models/job.py:24 ops/models/playbook.py:22 ops/serializers/job.py:19
|
||||||
#: perms/models/asset_permission.py:56 rbac/models/role.py:29
|
#: orgs/models.py:69 perms/models/asset_permission.py:56 rbac/models/role.py:29
|
||||||
#: settings/models.py:33 settings/serializers/sms.py:6
|
#: settings/models.py:33 settings/serializers/sms.py:6
|
||||||
#: terminal/models/applet/applet.py:26 terminal/models/component/endpoint.py:12
|
#: terminal/models/applet/applet.py:26 terminal/models/component/endpoint.py:12
|
||||||
#: terminal/models/component/endpoint.py:90
|
#: terminal/models/component/endpoint.py:90
|
||||||
|
|
@ -577,7 +577,7 @@ msgstr "密钥/密码"
|
||||||
msgid "Key password"
|
msgid "Key password"
|
||||||
msgstr "密钥密码"
|
msgstr "密钥密码"
|
||||||
|
|
||||||
#: accounts/serializers/account/base.py:80
|
#: accounts/serializers/account/base.py:81
|
||||||
#: assets/serializers/asset/common.py:280
|
#: assets/serializers/asset/common.py:280
|
||||||
msgid "Spec info"
|
msgid "Spec info"
|
||||||
msgstr "特殊信息"
|
msgstr "特殊信息"
|
||||||
|
|
@ -734,7 +734,7 @@ msgid "User"
|
||||||
msgstr "用户"
|
msgstr "用户"
|
||||||
|
|
||||||
#: acls/models/command_acl.py:16 assets/models/cmd_filter.py:60
|
#: acls/models/command_acl.py:16 assets/models/cmd_filter.py:60
|
||||||
#: ops/serializers/job.py:53 terminal/models/session/session.py:41
|
#: ops/serializers/job.py:63 terminal/models/session/session.py:41
|
||||||
#: terminal/serializers/command.py:17 terminal/serializers/session.py:19
|
#: terminal/serializers/command.py:17 terminal/serializers/session.py:19
|
||||||
#: terminal/templates/terminal/_msg_command_alert.html:12
|
#: terminal/templates/terminal/_msg_command_alert.html:12
|
||||||
#: terminal/templates/terminal/_msg_command_execute_alert.html:10
|
#: terminal/templates/terminal/_msg_command_execute_alert.html:10
|
||||||
|
|
@ -909,15 +909,15 @@ msgstr "不能直接创建资产, 你应该创建主机或其他资产"
|
||||||
msgid "Number required"
|
msgid "Number required"
|
||||||
msgstr "需要为数字"
|
msgstr "需要为数字"
|
||||||
|
|
||||||
#: assets/api/node.py:56
|
#: assets/api/node.py:58
|
||||||
msgid "You can't update the root node name"
|
msgid "You can't update the root node name"
|
||||||
msgstr "不能修改根节点名称"
|
msgstr "不能修改根节点名称"
|
||||||
|
|
||||||
#: assets/api/node.py:63
|
#: assets/api/node.py:65
|
||||||
msgid "You can't delete the root node ({})"
|
msgid "You can't delete the root node ({})"
|
||||||
msgstr "不能删除根节点 ({})"
|
msgstr "不能删除根节点 ({})"
|
||||||
|
|
||||||
#: assets/api/node.py:66
|
#: assets/api/node.py:68
|
||||||
msgid "Deletion failed and the node contains assets"
|
msgid "Deletion failed and the node contains assets"
|
||||||
msgstr "删除失败，节点包含资产"
|
msgstr "删除失败，节点包含资产"
|
||||||
|
|
||||||
|
|
@ -1045,8 +1045,8 @@ msgstr "SSH公钥"
|
||||||
|
|
||||||
#: assets/models/_user.py:27 assets/models/cmd_filter.py:40
|
#: assets/models/_user.py:27 assets/models/cmd_filter.py:40
|
||||||
#: assets/models/cmd_filter.py:88 assets/models/group.py:23
|
#: assets/models/cmd_filter.py:88 assets/models/group.py:23
|
||||||
#: assets/models/platform.py:79 common/db/models.py:37 ops/models/adhoc.py:28
|
#: assets/models/platform.py:79 common/db/models.py:37 ops/models/adhoc.py:27
|
||||||
#: ops/models/job.py:40 ops/models/playbook.py:18 rbac/models/role.py:37
|
#: ops/models/job.py:40 ops/models/playbook.py:25 rbac/models/role.py:37
|
||||||
#: settings/models.py:38 terminal/models/applet/applet.py:35
|
#: settings/models.py:38 terminal/models/applet/applet.py:35
|
||||||
#: terminal/models/applet/applet.py:151 terminal/models/applet/host.py:110
|
#: terminal/models/applet/applet.py:151 terminal/models/applet/host.py:110
|
||||||
#: terminal/models/component/endpoint.py:24
|
#: terminal/models/component/endpoint.py:24
|
||||||
|
|
@ -1059,7 +1059,7 @@ msgstr "备注"
|
||||||
|
|
||||||
#: assets/models/_user.py:28 assets/models/automations/base.py:105
|
#: assets/models/_user.py:28 assets/models/automations/base.py:105
|
||||||
#: assets/models/cmd_filter.py:41 assets/models/group.py:22
|
#: assets/models/cmd_filter.py:41 assets/models/group.py:22
|
||||||
#: common/db/models.py:35 ops/models/base.py:54 ops/models/job.py:112
|
#: common/db/models.py:35 ops/models/base.py:54 ops/models/job.py:113
|
||||||
#: users/models/user.py:943
|
#: users/models/user.py:943
|
||||||
msgid "Date created"
|
msgid "Date created"
|
||||||
msgstr "创建日期"
|
msgstr "创建日期"
|
||||||
|
|
@ -1196,6 +1196,10 @@ msgstr "添加资产到节点"
|
||||||
msgid "Move asset to node"
|
msgid "Move asset to node"
|
||||||
msgstr "移动资产到节点"
|
msgstr "移动资产到节点"
|
||||||
|
|
||||||
|
#: assets/models/asset/common.py:292
|
||||||
|
msgid "Remove asset from node"
|
||||||
|
msgstr "从节点移除资产"
|
||||||
|
|
||||||
#: assets/models/asset/database.py:10 assets/serializers/asset/common.py:105
|
#: assets/models/asset/database.py:10 assets/serializers/asset/common.py:105
|
||||||
#: settings/serializers/email.py:37
|
#: settings/serializers/email.py:37
|
||||||
msgid "Use SSL"
|
msgid "Use SSL"
|
||||||
|
|
@ -1251,7 +1255,7 @@ msgid "Asset automation task"
|
||||||
msgstr "资产自动化任务"
|
msgstr "资产自动化任务"
|
||||||
|
|
||||||
#: assets/models/automations/base.py:104 audits/models.py:163
|
#: assets/models/automations/base.py:104 audits/models.py:163
|
||||||
#: audits/serializers.py:50 ops/models/base.py:49 ops/models/job.py:105
|
#: audits/serializers.py:50 ops/models/base.py:49 ops/models/job.py:106
|
||||||
#: terminal/models/applet/applet.py:150 terminal/models/applet/host.py:107
|
#: terminal/models/applet/applet.py:150 terminal/models/applet/host.py:107
|
||||||
#: terminal/models/component/status.py:27 terminal/serializers/applet.py:17
|
#: terminal/models/component/status.py:27 terminal/serializers/applet.py:17
|
||||||
#: terminal/serializers/applet_host.py:93 tickets/models/ticket/general.py:283
|
#: terminal/serializers/applet_host.py:93 tickets/models/ticket/general.py:283
|
||||||
|
|
@ -1654,6 +1658,12 @@ msgstr "周期性检查节点下资产数量"
|
||||||
msgid "Test if the assets under the node are connectable "
|
msgid "Test if the assets under the node are connectable "
|
||||||
msgstr "测试节点下资产是否可连接"
|
msgstr "测试节点下资产是否可连接"
|
||||||
|
|
||||||
|
#: assets/tasks/ping_gateway.py:23 assets/tasks/ping_gateway.py:33
|
||||||
|
#, fuzzy
|
||||||
|
#| msgid "Test assets connectivity "
|
||||||
|
msgid "Test gateways connectivity "
|
||||||
|
msgstr "测试资产可连接性"
|
||||||
|
|
||||||
#: assets/tasks/utils.py:17
|
#: assets/tasks/utils.py:17
|
||||||
msgid "Asset has been disabled, skipped: {}"
|
msgid "Asset has been disabled, skipped: {}"
|
||||||
msgstr "资产已经被禁用, 跳过: {}"
|
msgstr "资产已经被禁用, 跳过: {}"
|
||||||
|
|
@ -3148,15 +3158,15 @@ msgstr "系统信息"
|
||||||
msgid "Publish the station message"
|
msgid "Publish the station message"
|
||||||
msgstr "发布站内消息"
|
msgstr "发布站内消息"
|
||||||
|
|
||||||
#: ops/ansible/inventory.py:76
|
#: ops/ansible/inventory.py:77
|
||||||
msgid "No account available"
|
msgid "No account available"
|
||||||
msgstr "无可用账号"
|
msgstr "无可用账号"
|
||||||
|
|
||||||
#: ops/ansible/inventory.py:182
|
#: ops/ansible/inventory.py:186
|
||||||
msgid "Ansible disabled"
|
msgid "Ansible disabled"
|
||||||
msgstr "Ansible 已禁用"
|
msgstr "Ansible 已禁用"
|
||||||
|
|
||||||
#: ops/ansible/inventory.py:198
|
#: ops/ansible/inventory.py:202
|
||||||
msgid "Skip hosts below:"
|
msgid "Skip hosts below:"
|
||||||
msgstr "跳过以下主机: "
|
msgstr "跳过以下主机: "
|
||||||
|
|
||||||
|
|
@ -3261,21 +3271,21 @@ msgstr "输入在 {} - {} 范围之间"
|
||||||
msgid "Require periodic or regularly perform setting"
|
msgid "Require periodic or regularly perform setting"
|
||||||
msgstr "需要周期或定期设置"
|
msgstr "需要周期或定期设置"
|
||||||
|
|
||||||
#: ops/models/adhoc.py:23
|
#: ops/models/adhoc.py:22
|
||||||
msgid "Pattern"
|
msgid "Pattern"
|
||||||
msgstr "模式"
|
msgstr "模式"
|
||||||
|
|
||||||
#: ops/models/adhoc.py:25 ops/models/job.py:28
|
#: ops/models/adhoc.py:24 ops/models/job.py:28
|
||||||
msgid "Module"
|
msgid "Module"
|
||||||
msgstr "模块"
|
msgstr "模块"
|
||||||
|
|
||||||
#: ops/models/adhoc.py:26 ops/models/celery.py:58 ops/models/job.py:26
|
#: ops/models/adhoc.py:25 ops/models/celery.py:58 ops/models/job.py:26
|
||||||
#: terminal/models/component/task.py:16
|
#: terminal/models/component/task.py:16
|
||||||
msgid "Args"
|
msgid "Args"
|
||||||
msgstr "参数"
|
msgstr "参数"
|
||||||
|
|
||||||
#: ops/models/adhoc.py:27 ops/models/base.py:16 ops/models/base.py:53
|
#: ops/models/adhoc.py:26 ops/models/base.py:16 ops/models/base.py:53
|
||||||
#: ops/models/job.py:33 ops/models/job.py:111 ops/models/playbook.py:17
|
#: ops/models/job.py:33 ops/models/job.py:112 ops/models/playbook.py:24
|
||||||
#: terminal/models/session/sharing.py:23
|
#: terminal/models/session/sharing.py:23
|
||||||
msgid "Creator"
|
msgid "Creator"
|
||||||
msgstr "创建者"
|
msgstr "创建者"
|
||||||
|
|
@ -3292,16 +3302,16 @@ msgstr "账号策略"
|
||||||
msgid "Last execution"
|
msgid "Last execution"
|
||||||
msgstr "最后执行"
|
msgstr "最后执行"
|
||||||
|
|
||||||
#: ops/models/base.py:22 ops/serializers/job.py:16
|
#: ops/models/base.py:22 ops/serializers/job.py:18
|
||||||
msgid "Date last run"
|
msgid "Date last run"
|
||||||
msgstr "最后运行日期"
|
msgstr "最后运行日期"
|
||||||
|
|
||||||
#: ops/models/base.py:51 ops/models/job.py:109
|
#: ops/models/base.py:51 ops/models/job.py:110
|
||||||
#: xpack/plugins/cloud/models.py:162
|
#: xpack/plugins/cloud/models.py:162
|
||||||
msgid "Result"
|
msgid "Result"
|
||||||
msgstr "结果"
|
msgstr "结果"
|
||||||
|
|
||||||
#: ops/models/base.py:52 ops/models/job.py:110
|
#: ops/models/base.py:52 ops/models/job.py:111
|
||||||
msgid "Summary"
|
msgid "Summary"
|
||||||
msgstr "汇总"
|
msgstr "汇总"
|
||||||
|
|
||||||
|
|
@ -3369,31 +3379,31 @@ msgstr "参数定义"
|
||||||
msgid "Job"
|
msgid "Job"
|
||||||
msgstr "作业"
|
msgstr "作业"
|
||||||
|
|
||||||
#: ops/models/job.py:108
|
#: ops/models/job.py:109
|
||||||
msgid "Parameters"
|
msgid "Parameters"
|
||||||
msgstr "参数"
|
msgstr "参数"
|
||||||
|
|
||||||
#: ops/models/job.py:116
|
#: ops/models/job.py:117
|
||||||
msgid "Material"
|
msgid "Material"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ops/models/job.py:118
|
#: ops/models/job.py:119
|
||||||
msgid "Material Type"
|
msgid "Material Type"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ops/models/job.py:311
|
#: ops/models/job.py:322
|
||||||
msgid "Job Execution"
|
msgid "Job Execution"
|
||||||
msgstr "作业执行"
|
msgstr "作业执行"
|
||||||
|
|
||||||
#: ops/models/job.py:322
|
#: ops/models/job.py:333
|
||||||
msgid "Job audit log"
|
msgid "Job audit log"
|
||||||
msgstr "作业审计日志"
|
msgstr "作业审计日志"
|
||||||
|
|
||||||
#: ops/models/playbook.py:20
|
#: ops/models/playbook.py:27
|
||||||
msgid "CreateMethod"
|
msgid "CreateMethod"
|
||||||
msgstr "创建方式"
|
msgstr "创建方式"
|
||||||
|
|
||||||
#: ops/models/playbook.py:21
|
#: ops/models/playbook.py:28
|
||||||
msgid "VCS URL"
|
msgid "VCS URL"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -3425,19 +3435,19 @@ msgstr "内存使用率超过 {max_threshold}%: => {value}"
|
||||||
msgid "CPU load more than {max_threshold}: => {value}"
|
msgid "CPU load more than {max_threshold}: => {value}"
|
||||||
msgstr "CPU 使用率超过 {max_threshold}: => {value}"
|
msgstr "CPU 使用率超过 {max_threshold}: => {value}"
|
||||||
|
|
||||||
#: ops/serializers/job.py:14
|
#: ops/serializers/job.py:16
|
||||||
msgid "Run after save"
|
msgid "Run after save"
|
||||||
msgstr "保存后执行"
|
msgstr "保存后执行"
|
||||||
|
|
||||||
#: ops/serializers/job.py:52
|
#: ops/serializers/job.py:62
|
||||||
msgid "Job type"
|
msgid "Job type"
|
||||||
msgstr "任务类型"
|
msgstr "任务类型"
|
||||||
|
|
||||||
#: ops/serializers/job.py:55 terminal/serializers/session.py:53
|
#: ops/serializers/job.py:65 terminal/serializers/session.py:53
|
||||||
msgid "Is finished"
|
msgid "Is finished"
|
||||||
msgstr "是否完成"
|
msgstr "是否完成"
|
||||||
|
|
||||||
#: ops/serializers/job.py:56
|
#: ops/serializers/job.py:66
|
||||||
msgid "Time cost"
|
msgid "Time cost"
|
||||||
msgstr "花费时间"
|
msgstr "花费时间"
|
||||||
|
|
||||||
|
|
@ -3877,7 +3887,7 @@ msgstr "查看授权树"
|
||||||
msgid "Test success"
|
msgid "Test success"
|
||||||
msgstr "测试成功"
|
msgstr "测试成功"
|
||||||
|
|
||||||
#: settings/api/email.py:20
|
#: settings/api/email.py:21
|
||||||
msgid "Test mail sent to {}, please check"
|
msgid "Test mail sent to {}, please check"
|
||||||
msgstr "邮件已经发送{}, 请检查"
|
msgstr "邮件已经发送{}, 请检查"
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue