From a09b81df3fe8e06774b27918ca235313250b6884 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Wed, 26 Aug 2020 17:11:42 +0800
Subject: [PATCH] devops

---
 src/forge/DevOps/About.jsx        |  1 -
 src/forge/DevOps/Dispose.jsx      |  5 ++++-
 src/forge/DevOps/DisposeModal.jsx |  4 ++--
 src/forge/DevOps/Structure.jsx    |  2 --
 src/forge/Main/Detail.js          | 18 +++++++++++-------
 5 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/forge/DevOps/About.jsx b/src/forge/DevOps/About.jsx
index 6e382cb0..f2b9a130 100644
--- a/src/forge/DevOps/About.jsx
+++ b/src/forge/DevOps/About.jsx
@@ -120,7 +120,6 @@ function About(props, ref) {
     }else{
       s=step+num;
     }
-    console.log(s);
     setStep(s);
   }
 
diff --git a/src/forge/DevOps/Dispose.jsx b/src/forge/DevOps/Dispose.jsx
index 5be238db..54b8fe5f 100644
--- a/src/forge/DevOps/Dispose.jsx
+++ b/src/forge/DevOps/Dispose.jsx
@@ -12,6 +12,7 @@ function Dispose(props){
   const [ info , setInfo ] = useState('.trustie-pipeline.yml');
   const [ visible , setVisible ] = useState(false);
   const [ ymlValue , setYmlValue ] = useState("");
+  const [ sha , setSha ] = useState(undefined);
   const [ six , setSix ] = useState(undefined);
   const [ fileLanguage , setFileLanguage ] = useState(undefined);
   const [ first , setFirst ] = useState(false);
@@ -31,6 +32,7 @@ function Dispose(props){
           setInfo(result.data.name);
           setYmlValue(result.data.content);
           setFirst(true);
+          setSha(result.data.sha);
         }else{
           setFirst(false);
         }
@@ -66,7 +68,7 @@ function Dispose(props){
       url = `/${owner}/${projectsId}/update_trustie_pipeline.json`;
       axios.put(url,{
         ...params,
-        sha:info && info.sha
+        sha
       }).then(result=>{
         if(result){
           setVisible(true);
@@ -86,6 +88,7 @@ function Dispose(props){
     }
   }
   function suresubmit(){
+    setVisible(false);
     props.history.push(`/projects/${owner}/${projectsId}/devops/list`);
   }
   
diff --git a/src/forge/DevOps/DisposeModal.jsx b/src/forge/DevOps/DisposeModal.jsx
index 1ef263c7..67aa72c4 100644
--- a/src/forge/DevOps/DisposeModal.jsx
+++ b/src/forge/DevOps/DisposeModal.jsx
@@ -8,7 +8,7 @@ const Div = styled.div`{
   text-align:center;
   color:#333;
 }`
-export default (({visible , closeFunc , suresubmit})=>{
+export default (({visible , closeFunc , sureFunc})=>{
   return(
     <Modal
       title="提示"
@@ -17,7 +17,7 @@ export default (({visible , closeFunc , suresubmit})=>{
       footer={
         <div>
           <Button onClick={()=>closeFunc(false)}>取消</Button>
-          <Button type={"primary"} onClick={suresubmit} style={{marginLeft:"20px"}}>确定</Button>
+          <Button type={"primary"} onClick={()=>sureFunc()} style={{marginLeft:"20px"}}>确定</Button>
         </div>
       }
       onCancel={()=>closeFunc(false)}
diff --git a/src/forge/DevOps/Structure.jsx b/src/forge/DevOps/Structure.jsx
index eceb95d5..e292c0a2 100644
--- a/src/forge/DevOps/Structure.jsx
+++ b/src/forge/DevOps/Structure.jsx
@@ -39,7 +39,6 @@ export default (props) => {
       }
     }).then((result) => {
       if (result && result.data) {
-        console.log(result);
         let list = result.data.builds && result.data.builds.map((item, key) => {
           return {
             ...item,
@@ -192,7 +191,6 @@ export default (props) => {
       key: "number",
       width: "8%",
       render: ( value, item, key) => {
-        console.log(item);
         return <span>#{value}</span>;
       },
     },
diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js
index 6d59fdf9..55f25e30 100644
--- a/src/forge/Main/Detail.js
+++ b/src/forge/Main/Detail.js
@@ -363,7 +363,7 @@ class Detail extends Component {
     const { projectDetail, watchers_count, praises_count, 
       forked_count, firstSync , secondSync , 
       isManager, watched, praised, 
-      project , open_devops } = this.state;
+      project , open_devops , author } = this.state;
       
     const url = this.props.history.location.pathname;
     const urlArr = url.split("/");
@@ -487,12 +487,16 @@ class Detail extends Component {
                       </Link>
                     </li>
                   }
-                  <li className={pathname==="devops" ? "active" : ""}>
-                    <Link to={{ pathname: `/projects/${owner}/${projectsId}/devops${open_devops ? `/dispose`:""}`, state }}>
-                      <i className="iconfont icon-gongzuoliu font-13 mr8"></i>工作流
-                      {projectDetail && projectDetail.ops_count ? <span>{projectDetail.ops_count}</span> : ""} 
-                    </Link>
-                  </li>
+                  {
+                    current_user && author && current_user.login === author.login ?
+                    <li className={pathname==="devops" ? "active" : ""}>
+                      <Link to={{ pathname: `/projects/${owner}/${projectsId}/devops${open_devops ? `/dispose`:""}`, state }}>
+                        <i className="iconfont icon-gongzuoliu font-13 mr8"></i>工作流
+                        {projectDetail && projectDetail.ops_count ? <span>{projectDetail.ops_count}</span> : ""} 
+                      </Link>
+                    </li>:""
+                  }
+                  
                   <li className={pathname==="milestones" ? "active" : ""}>
                     <Link to={{ pathname: `/projects/${owner}/${projectsId}/milestones`, state }}>
                       <img alt="" src={img_milepost} width="16" />里程碑