From ea77a13b6ffcf3ab287079ba98a03dca0b9ef33b Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Mon, 1 Feb 2021 16:53:33 +0800
Subject: [PATCH] url

---
 src/forge/DevOps/Dispose.jsx      | 16 ++++++++++------
 src/forge/DevOps/Dispose/List.jsx |  2 +-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/forge/DevOps/Dispose.jsx b/src/forge/DevOps/Dispose.jsx
index 65db7a78b..4c8ca9ca7 100644
--- a/src/forge/DevOps/Dispose.jsx
+++ b/src/forge/DevOps/Dispose.jsx
@@ -65,7 +65,7 @@ function Dispose(props){
     }
   },[owner,projectsId])
 
-  // 新增流水线
+  // 新增/编辑流水线
   function addNew(pipeline_name,id,branch,event){
     setVisible(true);
     setUpdateInfo(undefined);
@@ -79,17 +79,21 @@ function Dispose(props){
   function onOk(pipeline_name,updateId,branch,event){
     if(pipeline_name){
       let eventStr = "";
-      for(var i = 0;i<event.length;i++){
-        eventStr +=event[i]+",";
+      if(event.indexOf(",")>-1){
+        for(var i = 0;i<event.length;i++){
+          eventStr +=event[i]+",";
+        }
+        eventStr = eventStr.substring(0,eventStr.length-1);
+      }else{
+        eventStr = event;
       }
-      let s = eventStr.substring(0,eventStr.length-1);
       if(!updateId){
         // 新增
         const url = `/ci/pipelines.json`;
         axios.post(url,{
           pipeline_name,
           file_name:".trustie-pipeline.yml",
-          repo:projectsId,branch,event:s,owner
+          repo:projectsId,branch,event:eventStr,owner
         }).then(result=>{
           setVisible(false);
           if(result && result.data){
@@ -103,7 +107,7 @@ function Dispose(props){
         // 修改
         const url = `/ci/pipelines/${updateId}.json`;
         axios.put(url,{
-          pipeline_name,repo:projectsId,branch,event:s,owner
+          pipeline_name,repo:projectsId,branch,event:eventStr,owner
         }).then(result=>{
           if(result && result.data){
             setVisible(false);
diff --git a/src/forge/DevOps/Dispose/List.jsx b/src/forge/DevOps/Dispose/List.jsx
index ebaac4b0f..b218281d5 100644
--- a/src/forge/DevOps/Dispose/List.jsx
+++ b/src/forge/DevOps/Dispose/List.jsx
@@ -32,7 +32,7 @@ function List({ list, operate , projectsId , owner , showModal , deleteFunc }){
       ellipsis:true,
       render:(value,item)=>{
         return(
-          <Link to={`/projects/${owner}/${projectsId}?url=${value}`} className="color-blue">{value}</Link>
+          <Link to={`/projects/${owner}/${projectsId}/branch/${item.branch}?url=${value}`} className="color-blue">{value}</Link>
         )
       }
     },