diff --git a/apps/i18n/core/en/LC_MESSAGES/django.po b/apps/i18n/core/en/LC_MESSAGES/django.po index 45373baeb..f5fc6fb50 100644 --- a/apps/i18n/core/en/LC_MESSAGES/django.po +++ b/apps/i18n/core/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-19 10:43+0800\n" +"POT-Creation-Date: 2024-06-19 17:36+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1765,7 +1765,7 @@ msgstr "" msgid "Allow invalid cert" msgstr "" -#: assets/models/asset/gpt.py:8 settings/serializers/feature.py:88 +#: assets/models/asset/gpt.py:8 settings/serializers/feature.py:87 msgid "Proxy" msgstr "" @@ -4199,7 +4199,7 @@ msgstr "" msgid "VCS" msgstr "" -#: ops/const.py:38 ops/models/adhoc.py:44 settings/serializers/feature.py:136 +#: ops/const.py:38 ops/models/adhoc.py:44 settings/serializers/feature.py:135 msgid "Adhoc" msgstr "" @@ -4704,7 +4704,7 @@ msgid "today" msgstr "" #: perms/notifications.py:12 perms/notifications.py:44 -#: settings/serializers/feature.py:127 +#: settings/serializers/feature.py:126 msgid "day" msgstr "" @@ -4975,8 +4975,8 @@ msgstr "Organizations" msgid "Ticket comment" msgstr "" -#: rbac/tree.py:159 settings/serializers/feature.py:114 -#: settings/serializers/feature.py:116 tickets/models/ticket/general.py:305 +#: rbac/tree.py:159 settings/serializers/feature.py:113 +#: settings/serializers/feature.py:115 tickets/models/ticket/general.py:305 msgid "Ticket" msgstr "" @@ -5734,12 +5734,11 @@ msgstr "" msgid "Mount Point" msgstr "" - -#: settings/serializers/feature.py:62 +#: settings/serializers/feature.py:61 msgid "Record limit" msgstr "" -#: settings/serializers/feature.py:64 +#: settings/serializers/feature.py:63 msgid "" "If the specific value is less than 999 (default), the system will " "automatically perform a task every night: check and delete historical " @@ -5747,82 +5746,82 @@ msgid "" "exceeds 999 (default), no historical account deletion will be performed" msgstr "" -#: settings/serializers/feature.py:74 settings/serializers/feature.py:78 +#: settings/serializers/feature.py:73 settings/serializers/feature.py:77 msgid "Chat AI" msgstr "" -#: settings/serializers/feature.py:81 +#: settings/serializers/feature.py:80 msgid "Base URL" msgstr "" -#: settings/serializers/feature.py:82 +#: settings/serializers/feature.py:81 msgid "The base URL of the GPT service. For example: https://api.openai.com/v1" msgstr "" -#: settings/serializers/feature.py:85 templates/_header_bar.html:96 +#: settings/serializers/feature.py:84 templates/_header_bar.html:96 msgid "API Key" msgstr "" -#: settings/serializers/feature.py:89 +#: settings/serializers/feature.py:88 msgid "" "The proxy server address of the GPT service. For example: http://ip:port" msgstr "" -#: settings/serializers/feature.py:92 +#: settings/serializers/feature.py:91 msgid "GPT Model" msgstr "" -#: settings/serializers/feature.py:118 +#: settings/serializers/feature.py:117 msgid "Approval without login" msgstr "" -#: settings/serializers/feature.py:119 +#: settings/serializers/feature.py:118 msgid "Allow direct approval ticket without login" msgstr "" -#: settings/serializers/feature.py:123 +#: settings/serializers/feature.py:122 #, fuzzy #| msgid "Periodic run" msgid "Period" msgstr "Periodic" -#: settings/serializers/feature.py:124 +#: settings/serializers/feature.py:123 msgid "" "The default authorization time period when applying for assets via a ticket" msgstr "" -#: settings/serializers/feature.py:127 +#: settings/serializers/feature.py:126 msgid "hour" msgstr "" -#: settings/serializers/feature.py:128 +#: settings/serializers/feature.py:127 msgid "Unit" msgstr "" -#: settings/serializers/feature.py:128 +#: settings/serializers/feature.py:127 #, fuzzy #| msgid "Run period" msgid "The unit of period" msgstr "Period" -#: settings/serializers/feature.py:133 +#: settings/serializers/feature.py:132 msgid "Feature" msgstr "" -#: settings/serializers/feature.py:137 +#: settings/serializers/feature.py:136 msgid "" "Allow users to execute batch commands in the Workbench - Job Center - Adhoc" msgstr "" -#: settings/serializers/feature.py:141 +#: settings/serializers/feature.py:140 msgid "Command blacklist" msgstr "" -#: settings/serializers/feature.py:142 +#: settings/serializers/feature.py:141 msgid "Command blacklist in Adhoc" msgstr "" -#: settings/serializers/feature.py:147 +#: settings/serializers/feature.py:146 #: terminal/models/virtualapp/provider.py:17 #: terminal/models/virtualapp/virtualapp.py:36 #: terminal/models/virtualapp/virtualapp.py:97 @@ -5830,11 +5829,11 @@ msgstr "" msgid "Virtual app" msgstr "" -#: settings/serializers/feature.py:150 +#: settings/serializers/feature.py:149 msgid "Virtual App" msgstr "" -#: settings/serializers/feature.py:152 +#: settings/serializers/feature.py:151 msgid "" "Virtual applications, you can use the Linux operating system as an " "application server in remote applications." @@ -7652,7 +7651,7 @@ msgstr "" msgid "Ticket already closed" msgstr "" -#: tickets/handlers/apply_asset.py:36 +#: tickets/handlers/apply_asset.py:39 msgid "" "Created by the ticket ticket title: {} ticket applicant: {} ticket " "processor: {} ticket ID: {}" diff --git a/apps/i18n/core/ja/LC_MESSAGES/django.po b/apps/i18n/core/ja/LC_MESSAGES/django.po index 964e38ef6..9b6eb9ff8 100644 --- a/apps/i18n/core/ja/LC_MESSAGES/django.po +++ b/apps/i18n/core/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: 2024-06-19 10:43+0800\n" +"POT-Creation-Date: 2024-06-19 17:36+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1750,7 +1750,7 @@ msgstr "プラットフォーム" #: assets/models/asset/common.py:163 assets/models/domain.py:22 msgid "Zone" -msgstr "" +msgstr "ゾーン" #: assets/models/asset/common.py:166 assets/serializers/asset/common.py:385 #: assets/serializers/asset/host.py:11 @@ -1797,7 +1797,7 @@ msgstr "クライアントキー" msgid "Allow invalid cert" msgstr "証明書チェックを無視" -#: assets/models/asset/gpt.py:8 settings/serializers/feature.py:88 +#: assets/models/asset/gpt.py:8 settings/serializers/feature.py:87 msgid "Proxy" msgstr "プロキシー" @@ -4297,7 +4297,7 @@ msgstr "空欄" msgid "VCS" msgstr "VCS" -#: ops/const.py:38 ops/models/adhoc.py:44 settings/serializers/feature.py:136 +#: ops/const.py:38 ops/models/adhoc.py:44 settings/serializers/feature.py:135 msgid "Adhoc" msgstr "コマンド#コマンド#" @@ -4803,7 +4803,7 @@ msgid "today" msgstr "今日" #: perms/notifications.py:12 perms/notifications.py:44 -#: settings/serializers/feature.py:127 +#: settings/serializers/feature.py:126 msgid "day" msgstr "日" @@ -5082,8 +5082,8 @@ msgstr "アプリ組織" msgid "Ticket comment" msgstr "チケットコメント" -#: rbac/tree.py:159 settings/serializers/feature.py:114 -#: settings/serializers/feature.py:116 tickets/models/ticket/general.py:305 +#: rbac/tree.py:159 settings/serializers/feature.py:113 +#: settings/serializers/feature.py:115 tickets/models/ticket/general.py:305 msgid "Ticket" msgstr "チケット" @@ -5855,11 +5855,11 @@ msgstr "有効化 Vault" msgid "Mount Point" msgstr "マウントポイント" -#: settings/serializers/feature.py:62 +#: settings/serializers/feature.py:61 msgid "Record limit" msgstr "" -#: settings/serializers/feature.py:64 +#: settings/serializers/feature.py:63 msgid "" "If the specific value is less than 999 (default), the system will " "automatically perform a task every night: check and delete historical " @@ -5870,80 +5870,80 @@ msgstr "" "所定の数を超える履歴アカウントを確認して削除します。 値が 999 以上の場合、履" "歴アカウントの削除は実行されません。" -#: settings/serializers/feature.py:74 settings/serializers/feature.py:78 +#: settings/serializers/feature.py:73 settings/serializers/feature.py:77 msgid "Chat AI" msgstr "チャットAI" -#: settings/serializers/feature.py:81 +#: settings/serializers/feature.py:80 msgid "Base URL" msgstr "ベースサイトのアドレス" -#: settings/serializers/feature.py:82 +#: settings/serializers/feature.py:81 msgid "The base URL of the GPT service. For example: https://api.openai.com/v1" msgstr "" -#: settings/serializers/feature.py:85 templates/_header_bar.html:96 +#: settings/serializers/feature.py:84 templates/_header_bar.html:96 msgid "API Key" msgstr "API Key" -#: settings/serializers/feature.py:89 +#: settings/serializers/feature.py:88 msgid "" "The proxy server address of the GPT service. For example: http://ip:port" msgstr "" -#: settings/serializers/feature.py:92 +#: settings/serializers/feature.py:91 msgid "GPT Model" msgstr "GPTモデル" -#: settings/serializers/feature.py:118 +#: settings/serializers/feature.py:117 msgid "Approval without login" msgstr "ログイン承認なし" -#: settings/serializers/feature.py:119 +#: settings/serializers/feature.py:118 msgid "Allow direct approval ticket without login" msgstr "ログインせずに直接承認チケットを許可します" -#: settings/serializers/feature.py:123 +#: settings/serializers/feature.py:122 msgid "Period" msgstr "期間" -#: settings/serializers/feature.py:124 +#: settings/serializers/feature.py:123 msgid "" "The default authorization time period when applying for assets via a ticket" msgstr "" -#: settings/serializers/feature.py:127 +#: settings/serializers/feature.py:126 msgid "hour" msgstr "時" -#: settings/serializers/feature.py:128 +#: settings/serializers/feature.py:127 msgid "Unit" msgstr "単位" -#: settings/serializers/feature.py:128 +#: settings/serializers/feature.py:127 msgid "The unit of period" msgstr "ユーザーの実行" -#: settings/serializers/feature.py:133 +#: settings/serializers/feature.py:132 msgid "Feature" msgstr "機能" -#: settings/serializers/feature.py:137 +#: settings/serializers/feature.py:136 msgid "" "Allow users to execute batch commands in the Workbench - Job Center - Adhoc" msgstr "" "ユーザーがワークベンチ - ジョブセンター - Adhocでバッチコマンドを実行すること" "を許可します" -#: settings/serializers/feature.py:141 +#: settings/serializers/feature.py:140 msgid "Command blacklist" msgstr "コマンドフィルタリング" -#: settings/serializers/feature.py:142 +#: settings/serializers/feature.py:141 msgid "Command blacklist in Adhoc" msgstr "コマンドフィルタリング" -#: settings/serializers/feature.py:147 +#: settings/serializers/feature.py:146 #: terminal/models/virtualapp/provider.py:17 #: terminal/models/virtualapp/virtualapp.py:36 #: terminal/models/virtualapp/virtualapp.py:97 @@ -5951,11 +5951,11 @@ msgstr "コマンドフィルタリング" msgid "Virtual app" msgstr "仮想アプリケーション" -#: settings/serializers/feature.py:150 +#: settings/serializers/feature.py:149 msgid "Virtual App" msgstr "仮想アプリケーション" -#: settings/serializers/feature.py:152 +#: settings/serializers/feature.py:151 msgid "" "Virtual applications, you can use the Linux operating system as an " "application server in remote applications." @@ -7870,7 +7870,7 @@ msgstr "有効な許可を受けた資産" msgid "Ticket already closed" msgstr "チケットはすでに閉じています" -#: tickets/handlers/apply_asset.py:36 +#: tickets/handlers/apply_asset.py:39 msgid "" "Created by the ticket ticket title: {} ticket applicant: {} ticket " "processor: {} ticket ID: {}" diff --git a/apps/i18n/core/zh/LC_MESSAGES/django.po b/apps/i18n/core/zh/LC_MESSAGES/django.po index 9c4caba4e..3632af1fa 100644 --- a/apps/i18n/core/zh/LC_MESSAGES/django.po +++ b/apps/i18n/core/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: 2024-06-19 10:43+0800\n" +"POT-Creation-Date: 2024-06-19 17:36+0800\n" "PO-Revision-Date: 2021-05-20 10:54+0800\n" "Last-Translator: ibuler \n" "Language-Team: JumpServer team\n" @@ -1738,7 +1738,7 @@ msgstr "平台" #: assets/models/asset/common.py:163 assets/models/domain.py:22 msgid "Zone" -msgstr "" +msgstr "网域" #: assets/models/asset/common.py:166 assets/serializers/asset/common.py:385 #: assets/serializers/asset/host.py:11 @@ -1785,7 +1785,7 @@ msgstr "客户端密钥" msgid "Allow invalid cert" msgstr "忽略证书校验" -#: assets/models/asset/gpt.py:8 settings/serializers/feature.py:88 +#: assets/models/asset/gpt.py:8 settings/serializers/feature.py:87 msgid "Proxy" msgstr "代理" @@ -4240,7 +4240,7 @@ msgstr "空白" msgid "VCS" msgstr "VCS" -#: ops/const.py:38 ops/models/adhoc.py:44 settings/serializers/feature.py:136 +#: ops/const.py:38 ops/models/adhoc.py:44 settings/serializers/feature.py:135 msgid "Adhoc" msgstr "命令" @@ -4745,7 +4745,7 @@ msgid "today" msgstr "今天" #: perms/notifications.py:12 perms/notifications.py:44 -#: settings/serializers/feature.py:127 +#: settings/serializers/feature.py:126 msgid "day" msgstr "天" @@ -5023,8 +5023,8 @@ msgstr "组织管理" msgid "Ticket comment" msgstr "工单评论" -#: rbac/tree.py:159 settings/serializers/feature.py:114 -#: settings/serializers/feature.py:116 tickets/models/ticket/general.py:305 +#: rbac/tree.py:159 settings/serializers/feature.py:113 +#: settings/serializers/feature.py:115 tickets/models/ticket/general.py:305 msgid "Ticket" msgstr "工单" @@ -5233,7 +5233,7 @@ msgstr "CAS" #: settings/serializers/auth/cas.py:13 settings/serializers/auth/ldap.py:42 #: settings/serializers/auth/oidc.py:60 msgid "Server" -msgstr "LDAP 地址" +msgstr "服务端地址" #: settings/serializers/auth/cas.py:16 msgid "Proxy Server" @@ -5783,11 +5783,11 @@ msgstr "启用 Vault" msgid "Mount Point" msgstr "挂载点" -#: settings/serializers/feature.py:62 +#: settings/serializers/feature.py:61 msgid "Record limit" msgstr "" -#: settings/serializers/feature.py:64 +#: settings/serializers/feature.py:63 msgid "" "If the specific value is less than 999 (default), the system will " "automatically perform a task every night: check and delete historical " @@ -5797,78 +5797,78 @@ msgstr "" "若特定数值小于999,系统将在每日晚间自动执行任务:检查并删除超出预定数量的历史" "账号。如果该数值达到或超过999,则不进行任何历史账号的删除操作。" -#: settings/serializers/feature.py:74 settings/serializers/feature.py:78 +#: settings/serializers/feature.py:73 settings/serializers/feature.py:77 msgid "Chat AI" msgstr "聊天 AI" -#: settings/serializers/feature.py:81 +#: settings/serializers/feature.py:80 msgid "Base URL" msgstr "JumpServer 地址" -#: settings/serializers/feature.py:82 +#: settings/serializers/feature.py:81 msgid "The base URL of the GPT service. For example: https://api.openai.com/v1" msgstr "" -#: settings/serializers/feature.py:85 templates/_header_bar.html:96 +#: settings/serializers/feature.py:84 templates/_header_bar.html:96 msgid "API Key" msgstr "API Key" -#: settings/serializers/feature.py:89 +#: settings/serializers/feature.py:88 msgid "" "The proxy server address of the GPT service. For example: http://ip:port" msgstr "" -#: settings/serializers/feature.py:92 +#: settings/serializers/feature.py:91 msgid "GPT Model" msgstr "GPT 模型" -#: settings/serializers/feature.py:118 +#: settings/serializers/feature.py:117 msgid "Approval without login" msgstr "免登录审批" -#: settings/serializers/feature.py:119 +#: settings/serializers/feature.py:118 msgid "Allow direct approval ticket without login" msgstr "允许无需登录直接批准工单" -#: settings/serializers/feature.py:123 +#: settings/serializers/feature.py:122 msgid "Period" msgstr "时段" -#: settings/serializers/feature.py:124 +#: settings/serializers/feature.py:123 msgid "" "The default authorization time period when applying for assets via a ticket" msgstr "" -#: settings/serializers/feature.py:127 +#: settings/serializers/feature.py:126 msgid "hour" msgstr "时" -#: settings/serializers/feature.py:128 +#: settings/serializers/feature.py:127 msgid "Unit" msgstr "单位" -#: settings/serializers/feature.py:128 +#: settings/serializers/feature.py:127 msgid "The unit of period" msgstr "执行周期" -#: settings/serializers/feature.py:133 +#: settings/serializers/feature.py:132 msgid "Feature" msgstr "功能" -#: settings/serializers/feature.py:137 +#: settings/serializers/feature.py:136 msgid "" "Allow users to execute batch commands in the Workbench - Job Center - Adhoc" msgstr "允许用户在工作台 - 作业中心 - Adhoc 中执行批量命令" -#: settings/serializers/feature.py:141 +#: settings/serializers/feature.py:140 msgid "Command blacklist" msgstr "作业中心命令黑名单" -#: settings/serializers/feature.py:142 +#: settings/serializers/feature.py:141 msgid "Command blacklist in Adhoc" msgstr "作业中心命令黑名单" -#: settings/serializers/feature.py:147 +#: settings/serializers/feature.py:146 #: terminal/models/virtualapp/provider.py:17 #: terminal/models/virtualapp/virtualapp.py:36 #: terminal/models/virtualapp/virtualapp.py:97 @@ -5876,11 +5876,11 @@ msgstr "作业中心命令黑名单" msgid "Virtual app" msgstr "虚拟应用" -#: settings/serializers/feature.py:150 +#: settings/serializers/feature.py:149 msgid "Virtual App" msgstr "虚拟应用" -#: settings/serializers/feature.py:152 +#: settings/serializers/feature.py:151 msgid "" "Virtual applications, you can use the Linux operating system as an " "application server in remote applications." @@ -7750,7 +7750,7 @@ msgstr "有效授权的资产" msgid "Ticket already closed" msgstr "工单已经关闭" -#: tickets/handlers/apply_asset.py:36 +#: tickets/handlers/apply_asset.py:39 msgid "" "Created by the ticket ticket title: {} ticket applicant: {} ticket " "processor: {} ticket ID: {}" diff --git a/apps/i18n/lina/en.json b/apps/i18n/lina/en.json index a26ea5bd5..56b969d11 100644 --- a/apps/i18n/lina/en.json +++ b/apps/i18n/lina/en.json @@ -1338,5 +1338,7 @@ "IpType": "IP type", "PublicIp": "Public Ip", "PrivateIp": "Private Ip", - "VaultHCPMountPoint": "The mount point of the Vault server, default is jumpserver" + "VaultHCPMountPoint": "The mount point of the Vault server, default is jumpserver", + "WeChat": "WeChat", + "SuEnabled": "Enabled su" } \ No newline at end of file diff --git a/apps/i18n/lina/zh.json b/apps/i18n/lina/zh.json index d3fe8b27e..7fd0da372 100644 --- a/apps/i18n/lina/zh.json +++ b/apps/i18n/lina/zh.json @@ -905,7 +905,7 @@ "RemoteAddr": "远端地址", "Remove": "移除", "RemoveAssetFromNode": "从节点移除资产", - "RemoveSelected": "删除所选", + "RemoveSelected": "移除所选", "RemoveSuccessMsg": "移除成功", "Rename": "重命名", "RenameNode": "重命名节点", @@ -1100,7 +1100,7 @@ "StrategyHelpTip": "根据策略优先级识别资产(例如平台)的独特属性; 当资产的属性(如节点)可以配置为多个时,策略的所有动作都会被执行。", "StrategyList": "策略列表", "StrategyUpdate": "更新策略", - "SuEnabled": "启用开关", + "SuEnabled": "启用账号切换", "EnableDomain": "启用网域", "SuFrom": "切换自", "Submit": "提交", @@ -1339,5 +1339,5 @@ "IpType": "IP 类型", "PublicIp": "公有 IP", "PrivateIp": "私有 IP", - "VaultHCPMountPoint": "Vault 服务器的挂载点,默认为 jumpserver" + "WeChat": "微信" } \ No newline at end of file diff --git a/apps/tickets/handlers/apply_asset.py b/apps/tickets/handlers/apply_asset.py index 3b4c70729..c4fcc83d2 100644 --- a/apps/tickets/handlers/apply_asset.py +++ b/apps/tickets/handlers/apply_asset.py @@ -1,10 +1,13 @@ from django.utils.translation import gettext as _ +from common.utils import get_logger from orgs.utils import tmp_to_org from perms.models import AssetPermission from tickets.models import ApplyAssetTicket from .base import BaseHandler +logger = get_logger(__file__) + class Handler(BaseHandler): ticket: ApplyAssetTicket @@ -60,6 +63,10 @@ class Handler(BaseHandler): asset_permission = AssetPermission.objects.create(**permission_data) asset_permission.nodes.set(apply_nodes) asset_permission.assets.set(apply_assets) - asset_permission.users.add(self.ticket.applicant) + + try: + asset_permission.users.add(self.ticket.applicant) + except Exception as e: + logger.error('Add user to asset permission failed: %s', e) return asset_permission