From 53b75e2c6bc1ceed8a759a106e472f4bf491b9b2 Mon Sep 17 00:00:00 2001 From: Jianguo-Genius Date: Tue, 9 Jul 2024 10:49:55 +0800 Subject: [PATCH] =?UTF-8?q?style(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):=20?= =?UTF-8?q?=E6=9D=83=E9=99=90=E7=9A=84=E6=98=BE=E7=A4=BA=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../framework/sdk/src/main/resources/i18n/project.properties | 1 + .../sdk/src/main/resources/i18n/project_en_US.properties | 1 + .../sdk/src/main/resources/i18n/project_zh_CN.properties | 1 + .../sdk/src/main/resources/i18n/project_zh_TW.properties | 1 + .../functional/mapper/ExtFunctionalCaseTestMapper.xml | 2 +- .../project-management/src/main/resources/permission.json | 3 ++- 6 files changed, 7 insertions(+), 2 deletions(-) diff --git a/backend/framework/sdk/src/main/resources/i18n/project.properties b/backend/framework/sdk/src/main/resources/i18n/project.properties index eb579ef2da..6e77ac78bd 100644 --- a/backend/framework/sdk/src/main/resources/i18n/project.properties +++ b/backend/framework/sdk/src/main/resources/i18n/project.properties @@ -122,6 +122,7 @@ ding_app_key_is_null=钉钉的AppKey不能为空 ding_app_secret_is_null=钉钉的AppSecret不能为空 # permission permission.project_user.name=用户 +permission.project_user.invite=邀请 permission.project_group.name=用户组 permission.project_environment.name=环境管理 permission.project_file.name=文件管理 diff --git a/backend/framework/sdk/src/main/resources/i18n/project_en_US.properties b/backend/framework/sdk/src/main/resources/i18n/project_en_US.properties index c73d912fd1..a8b221e784 100644 --- a/backend/framework/sdk/src/main/resources/i18n/project_en_US.properties +++ b/backend/framework/sdk/src/main/resources/i18n/project_en_US.properties @@ -137,6 +137,7 @@ module.name.is.empty=Module parameter is empty module.name.is.error=Module parameter is error # permission permission.project_user.name=User +permission.project_user.invite=Invite permission.project_group.name=User group permission.project_environment.name=Environment management permission.project_file.name=File management diff --git a/backend/framework/sdk/src/main/resources/i18n/project_zh_CN.properties b/backend/framework/sdk/src/main/resources/i18n/project_zh_CN.properties index 9ef9e5b8b3..1c3f07f7b8 100644 --- a/backend/framework/sdk/src/main/resources/i18n/project_zh_CN.properties +++ b/backend/framework/sdk/src/main/resources/i18n/project_zh_CN.properties @@ -137,6 +137,7 @@ ding_app_key_is_null=钉钉的AppKey不能为空 ding_app_secret_is_null=钉钉的AppSecret不能为空 # permission permission.project_user.name=用户 +permission.project_user.invite=邀请 permission.project_group.name=用户组 permission.project_environment.name=环境管理 permission.project_file.name=文件管理 diff --git a/backend/framework/sdk/src/main/resources/i18n/project_zh_TW.properties b/backend/framework/sdk/src/main/resources/i18n/project_zh_TW.properties index a5368744c2..bd9d5746d4 100644 --- a/backend/framework/sdk/src/main/resources/i18n/project_zh_TW.properties +++ b/backend/framework/sdk/src/main/resources/i18n/project_zh_TW.properties @@ -137,6 +137,7 @@ ding_app_key_is_null = 釘釘的AppKey不能為空 ding_app_secret_is_null =釘釘的AppSecret不能為空 # permission permission.project_user.name=用戶 +permission.project_user.invite=邀請 permission.project_group.name=用戶組 permission.project_environment.name=環境管理 permission.project_file.name=文件管理 diff --git a/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtFunctionalCaseTestMapper.xml b/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtFunctionalCaseTestMapper.xml index af7a36ea95..5dd803d3b2 100644 --- a/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtFunctionalCaseTestMapper.xml +++ b/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtFunctionalCaseTestMapper.xml @@ -250,6 +250,6 @@ #{caseId} - AND source_type in ('API','SCENARIO'); + AND source_type in ('API','SCENARIO') \ No newline at end of file diff --git a/backend/services/project-management/src/main/resources/permission.json b/backend/services/project-management/src/main/resources/permission.json index c773dd4bdf..49721ad77e 100644 --- a/backend/services/project-management/src/main/resources/permission.json +++ b/backend/services/project-management/src/main/resources/permission.json @@ -27,7 +27,8 @@ "id": "PROJECT_USER:READ+ADD" }, { - "id": "PROJECT_USER:READ+INVITE" + "id": "PROJECT_USER:READ+INVITE", + "name": "permission.project_user.invite" }, { "id": "PROJECT_USER:READ+UPDATE"