项目支持关联运营产品和根据运营产品搜索 #9636

TencentBlueKing · Nov 13, 2023 · 668c8e2 · 668c8e2
1 parent f6415d0
commit 668c8e2
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/.../core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/constant/AuthI18nConstants.kt b/.../core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/constant/AuthI18nConstants.kt
@@ -36,6 +36,7 @@ object AuthI18nConstants {
     const val BK_GROUP_NAME = "bkGroupName" // 用户组名称
     const val BK_VALIDITY_PERIOD = "bkValidityPeriod" // 申请期限
     const val BK_CREATE_PROJECT_APPROVAL = "bkCreateProjectApproval" // 创建项目{0}审批
+    const val BK_UPDATE_PROJECT_APPROVAL = "bkUpdateProjectApproval" // 修改项目{0}审批
     const val BK_APPLY_TO_JOIN_PROJECT = "bkApplyToJoinProject" // 申请加入项目
     const val BK_APPLY_TO_JOIN_GROUP = "bkApplyToJoinGroup" // 申请加入用户组
     const val BK_DAY = "bkDay" // days

diff --git a/...ci/core/auth/biz-auth-rbac/src/main/kotlin/com/tencent/devops/auth/service/ItsmService.kt b/...ci/core/auth/biz-auth-rbac/src/main/kotlin/com/tencent/devops/auth/service/ItsmService.kt
@@ -129,7 +129,8 @@ class ItsmService @Autowired constructor(
         organization: String,
         authSecrecy: Int,
         subjectScopes: List<SubjectScopeInfo>,
-        productName: String
+        productName: String,
+        isCreateProject: Boolean = true
     ): ItsmContentDTO {
         logger.info("build grade manager itsm content:$projectName|$projectId|$organization|$productName")
         val itsmColumns = listOf(
@@ -166,7 +167,12 @@ class ItsmService @Autowired constructor(
         val itsmValue = ItsmValue.builder()
             .scheme("content_table")
             .label(
-                I18nUtil.getCodeLanMessage(AuthI18nConstants.BK_CREATE_PROJECT_APPROVAL)
+                I18nUtil.getCodeLanMessage(
+                    if (isCreateProject)
+                        AuthI18nConstants.BK_CREATE_PROJECT_APPROVAL
+                    else
+                        AuthI18nConstants.BK_UPDATE_PROJECT_APPROVAL
+                )
             )
             .value(listOf(value))
             .build()

diff --git a/...uth-rbac/src/main/kotlin/com/tencent/devops/auth/service/PermissionGradeManagerService.kt b/...uth-rbac/src/main/kotlin/com/tencent/devops/auth/service/PermissionGradeManagerService.kt
@@ -311,7 +311,8 @@ class PermissionGradeManagerService @Autowired constructor(
                         name = ALL_MEMBERS_NAME
                     )
                 ),
-                productName = projectApprovalInfo.productName!!
+                productName = projectApprovalInfo.productName!!,
+                isCreateProject = false
             )
             val gradeManagerDetail = iamV2ManagerService.getGradeManagerDetail(gradeManagerId)
             val gradeManagerApplicationUpdateDTO = GradeManagerApplicationUpdateDTO.builder()

diff --git a/support-files/i18n/auth/message_zh_CN.properties b/support-files/i18n/auth/message_zh_CN.properties
@@ -87,6 +87,7 @@ bkGroupName=用户组
 bkDay=天
 bkValidityPeriod=申请期限
 bkCreateProjectApproval=创建项目审批
+bkUpdateProjectApproval=修改项目审批
 bkApplyToJoinProject=申请加入项目
 bkApplyToJoinGroup=申请加入用户组
 bkDevopsName=蓝盾