From dac118dd263aac021dd6b2ef776cdeff100bce76 Mon Sep 17 00:00:00 2001 From: Bai Date: Mon, 19 Aug 2024 15:40:20 +0800 Subject: [PATCH] perf: delete organization message --- apps/i18n/lina/en.json | 4 ++-- apps/i18n/lina/ja.json | 2 +- apps/i18n/lina/zh.json | 4 ++-- apps/i18n/lina/zh_hant.json | 2 +- apps/orgs/api.py | 3 +-- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/apps/i18n/lina/en.json b/apps/i18n/lina/en.json index ce4363af4..51d3d35e0 100644 --- a/apps/i18n/lina/en.json +++ b/apps/i18n/lina/en.json @@ -416,8 +416,8 @@ "DeleteConfirmMessage": "Deletion is irreversible, do you wish to continue?", "DeleteErrorMsg": "Delete failed", "DeleteNode": "Delete node", - "DeleteOrgMsg": "User list, user group, asset list, network zone list, manage users, system users, tag management, asset authorization rules", - "DeleteOrgTitle": "Please ensure the following information within the organization has been deleted", + "DeleteOrgMsg": "User, User group, Asset, Node, Label, Zone, Authorization", + "DeleteOrgTitle": "Please delete the following resources within the organization first", "DeleteReleasedAssets": "Delete released assets", "DeleteSelected": "Delete selected", "DeleteSuccess": "Successfully deleted", diff --git a/apps/i18n/lina/ja.json b/apps/i18n/lina/ja.json index d1527e0fa..80f2ec5a8 100644 --- a/apps/i18n/lina/ja.json +++ b/apps/i18n/lina/ja.json @@ -431,7 +431,7 @@ "DeleteConfirmMessage": "一度削除すると復元はできません、続けますか？", "DeleteErrorMsg": "削除に失敗", "DeleteNode": "ノードを削除", - "DeleteOrgMsg": "ユーザーリスト、ユーザーグループ、資産リスト、ネットワークリスト、ユーザー管理、システムユーザー、タグ管理、資産承認ルール", + "DeleteOrgMsg": "ユーザー、ユーザーグループ、アセット、ノード、ラベル、ドメイン、アセットの認可", "DeleteOrgTitle": "以下の組織内の情報が削除されたことを確認してください", "DeleteReleasedAssets": "リリースされたアセットの削除", "DeleteSelected": "選択した項目を削除する", diff --git a/apps/i18n/lina/zh.json b/apps/i18n/lina/zh.json index f73ba2b88..447025f7e 100644 --- a/apps/i18n/lina/zh.json +++ b/apps/i18n/lina/zh.json @@ -416,8 +416,8 @@ "DeleteConfirmMessage": "删除后无法恢复,是否继续?", "DeleteErrorMsg": "删除失败", "DeleteNode": "删除节点", - "DeleteOrgMsg": "用户列表、用户组、资产列表、网域列表、管理用户、系统用户、标签管理、资产授权规则", - "DeleteOrgTitle": "请确保组织内的以下信息已删除", + "DeleteOrgMsg": "用户，用户组，资产，节点，标签，网域，资产授权", + "DeleteOrgTitle": "请确保组织内的以下资源已删除", "DeleteReleasedAssets": "删除已释放资产", "DeleteSelected": "删除所选", "DeleteSuccess": "删除成功", diff --git a/apps/i18n/lina/zh_hant.json b/apps/i18n/lina/zh_hant.json index f38256e0c..f2a1fb84d 100644 --- a/apps/i18n/lina/zh_hant.json +++ b/apps/i18n/lina/zh_hant.json @@ -553,7 +553,7 @@ "DeleteErrorMsg": "刪除失敗", "DeleteFile": "刪除文件", "DeleteNode": "刪除節點", - "DeleteOrgMsg": "用戶列表、用戶組、資產列表、網域列表、管理用戶、系統用戶、標籤管理、資產授權規則", + "DeleteOrgMsg": "用戶，用戶組，資產，節點，標籤，網域，資產授權", "DeleteOrgTitle": "請確保組織內的以下資訊已刪除", "DeleteReleasedAssets": "刪除已釋放資產", "DeleteSelected": "刪除所選", diff --git a/apps/orgs/api.py b/apps/orgs/api.py index eb1a980d6..b93479c7e 100644 --- a/apps/orgs/api.py +++ b/apps/orgs/api.py @@ -24,8 +24,7 @@ logger = get_logger(__file__) # 部分 org 相关的 model，需要清空这些数据之后才能删除该组织 org_related_models = [ - User, UserGroup, Asset, Label, Domain, Node, Label, - AssetPermission, + User, UserGroup, Asset, Node, Label, Domain, AssetPermission ]