admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3505 from LinuxSuRen/fix-multi-branch-input

Browse Source 
Fix Pipeline input failed in multi-branch mode
This commit is contained in:
KubeSphere CI Bot
2021-03-19 14:22:05 +08:00
committed by GitHub
parent 0a40cfdf0c bc0be03603
commit d6c7b0ae9e
5 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/kapis/devops/v1alpha2/devops.go
View File

@@ -379,10 +379,18 @@ func (h *ProjectPipelineHandler) hasSubmitPermission(req *restful.Request) (hasP
runId := req.PathParameter("run")
nodeId := req.PathParameter("node")
stepId := req.PathParameter("step")
branchName := req.PathParameter("branch")
// check if current user can approve this input
var res []clientDevOps.NodesDetail
if res, err = h.devopsOperator.GetNodesDetail(pipeParam.ProjectName, pipeParam.Name, runId, httpReq); err == nil {
if branchName == "" {
res, err = h.devopsOperator.GetNodesDetail(pipeParam.ProjectName, pipeParam.Name, runId, httpReq)
} else {
res, err = h.devopsOperator.GetBranchNodesDetail(pipeParam.ProjectName, pipeParam.Name, branchName, runId, httpReq)
}
if err == nil {
h.approvableCheck(res, parsePipelineParam(req))
for _, node := range res {