Merge pull request #1237 from lannoy0523/issue_1220

feat:流水线仓库管理员支持批量删除 #1220
TencentBlueKing · Oct 24, 2023 · d8bcbb3 · d8bcbb3
2 parents 52d94be + 0e6294c
commit d8bcbb3
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/...itory/src/main/kotlin/com/tencent/bkrepo/repository/controller/user/UserNodeController.kt b/...itory/src/main/kotlin/com/tencent/bkrepo/repository/controller/user/UserNodeController.kt
@@ -67,7 +67,6 @@ import com.tencent.bkrepo.repository.pojo.node.user.UserNodeUpdateRequest
 import com.tencent.bkrepo.repository.pojo.software.ProjectPackageOverview
 import com.tencent.bkrepo.repository.service.node.NodeSearchService
 import com.tencent.bkrepo.repository.service.node.NodeService
-import com.tencent.bkrepo.common.artifact.util.PipelineRepoUtils
 import io.swagger.annotations.Api
 import io.swagger.annotations.ApiOperation
 import io.swagger.annotations.ApiParam
@@ -159,7 +158,6 @@ class UserNodeController(
             fullPaths = fullPaths,
             operator = userId
         )
-        PipelineRepoUtils.forbidPipeline(repoName)
         return ResponseBuilder.success(nodeService.deleteNodes(nodesDeleteRequest))
     }
 

diff --git a/src/frontend/devops-repository/src/views/repoGeneric/index.vue b/src/frontend/devops-repository/src/views/repoGeneric/index.vue
@@ -52,7 +52,7 @@
                             {{$t('batchDownload')}}
                         </bk-button>
                         <bk-button
-                            v-if="multiSelect.length && repoName !== 'pipeline'"
+                            v-if="multiSelect.length && ((repoName === 'pipeline' && (userInfo.admin || userInfo.manage)) || repoName !== 'pipeline')"
                             class="ml10"
                             @click="handlerMultiDelete()">
                             {{ $t('batchDeletion') }}