From 7e47cad7449d505c54ea197519f1e0393d5b97ca Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Tue, 12 Jan 2021 17:36:30 +0800
Subject: [PATCH 1/3] pullrequest

---
 src/forge/DevOps/About.jsx      | 4 ++--
 src/forge/Merge/MessageCount.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/forge/DevOps/About.jsx b/src/forge/DevOps/About.jsx
index 82bee8e7..dd547b0c 100644
--- a/src/forge/DevOps/About.jsx
+++ b/src/forge/DevOps/About.jsx
@@ -176,10 +176,10 @@ function About(props, ref) {
           CurrentLogin !== AuthorLogin ?
           <div className="noOperation">DevOps开启功能暂未对项目创建者以外的角色开放，可以联系项目创建者进行开启，开启后便可查看构建信息。</div>:""
         }
-        <a href={"https://forum.trustie.net/forums/3080/detail"} target="_blank" style={{ color: "#5091FF"}}>
+        <a href={"https://forum.trustie.net/forums/3110/detail"} target="_blank" style={{ color: "#5091FF"}}>
           了解什么是DevOps？
         </a>
-        <a href={"https://forum.trustie.net/forums/3110/detail"} target="_blank" style={{ color: "#5091FF"}}>
+        <a href={"https://forum.trustie.net/forums/3080/detail"} target="_blank" style={{ color: "#5091FF"}}>
           如何使用DevOps？
         </a>
         {
diff --git a/src/forge/Merge/MessageCount.js b/src/forge/Merge/MessageCount.js
index 75921701..507c62dd 100644
--- a/src/forge/Merge/MessageCount.js
+++ b/src/forge/Merge/MessageCount.js
@@ -300,7 +300,7 @@ class MessageCount extends Component {
                       <div className="mt15">
                         <Tag className="pr-branch-tag">
                           <Link
-                            to={`/projects/${owner}/${data.pull_request.is_original?data.pull_request.fork_project_id:projectsId}/branch/${data.pull_request.head}`}
+                            to={`/projects/${owner}/${data.pull_request.is_original?data.pull_request.identifier:projectsId}/branch/${data.pull_request.head}`}
                             className="ver-middle"
                           >
                             {data.pull_request.is_original ? data.pull_request.fork_project_user : data.issue.project_author_name}:{data.pull_request.head}

From 9d0adc0747765a09e2b11a3ab593ba532a26b816 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Wed, 13 Jan 2021 14:16:18 +0800
Subject: [PATCH 2/3] pulls

---
 src/forge/Merge/MessageCount.js | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/forge/Merge/MessageCount.js b/src/forge/Merge/MessageCount.js
index 507c62dd..1e52b2f9 100644
--- a/src/forge/Merge/MessageCount.js
+++ b/src/forge/Merge/MessageCount.js
@@ -40,6 +40,7 @@ class MessageCount extends Component {
       SpinMerge: false,
       edit_spin: false,
       pr_status: undefined,
+      pull_request:undefined,
 
       copyVisible:false,
     };
@@ -69,11 +70,12 @@ class MessageCount extends Component {
     axios
       .get(url)
       .then((result) => {
-        if (result) {
+        if (result && result.data) {
           this.setState({
             data: result.data,
             SpinFlag: false,
-            pr_status: result.data && result.data.pull_request && result.data.pull_request.status,
+            pr_status: result.data.pull_request && result.data.pull_request.status,
+            pull_request:result.data.pull_request
           });
         } else {
           this.setState({ SpinFlag: false });
@@ -249,7 +251,8 @@ class MessageCount extends Component {
       isSpin,
       ismesrge,
       SpinFlag,
-      copyVisible
+      copyVisible,
+      pull_request
     } = this.state;
     const { current_user, projectDetail } = this.props;
     const menu = (
@@ -268,9 +271,11 @@ class MessageCount extends Component {
         </Menu.Item>
       </Menu>
     );
-
+    const permission = projectDetail && (projectDetail.permission === "Admin" || projectDetail.permission === "Owner");
+    const userLogin = current_user && current_user.login && (pull_request && pull_request.create_user === current_user.login);
+    const operate = current_user && projectDetail && pr_status === 0 && (permission || userLogin);
     return (
-      <div className="">
+      <div>
         {data ? (
           <div>
             <div className="main">
@@ -300,7 +305,7 @@ class MessageCount extends Component {
                       <div className="mt15">
                         <Tag className="pr-branch-tag">
                           <Link
-                            to={`/projects/${owner}/${data.pull_request.is_original?data.pull_request.identifier:projectsId}/branch/${data.pull_request.head}`}
+                            to={`/projects/${owner}/${data.pull_request.is_original?data.project_identifier:projectsId}/branch/${data.pull_request.head}`}
                             className="ver-middle"
                           >
                             {data.pull_request.is_original ? data.pull_request.fork_project_user : data.issue.project_author_name}:{data.pull_request.head}
@@ -401,9 +406,7 @@ class MessageCount extends Component {
                         </Dropdown>
                         <span>下载为<i className="iconfont icon-sanjiaoxing-down color-blue"></i></span>
                       </span> */}
-                      {current_user && projectDetail &&
-                        pr_status === 0 &&
-                        projectDetail.permission !=="Reporter" && (
+                      {operate && (
                           <Button
                             type="green"
                             ghost
@@ -413,7 +416,7 @@ class MessageCount extends Component {
                             编辑
                           </Button>
                         )}
-                      {projectDetail && projectDetail.permission !=="Reporter" && pr_status === 0 && (
+                      {operate && (
                         <Button
                           type="danger"
                           ghost

From 68935245f0ab6fa95fe821a6d16a18cc45c94a4d Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Wed, 13 Jan 2021 15:46:45 +0800
Subject: [PATCH 3/3] =?UTF-8?q?pulls=20=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Merge/MessageCount.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/forge/Merge/MessageCount.js b/src/forge/Merge/MessageCount.js
index 1e52b2f9..3e721ebc 100644
--- a/src/forge/Merge/MessageCount.js
+++ b/src/forge/Merge/MessageCount.js
@@ -271,9 +271,9 @@ class MessageCount extends Component {
         </Menu.Item>
       </Menu>
     );
-    const permission = projectDetail && (projectDetail.permission === "Admin" || projectDetail.permission === "Owner");
-    const userLogin = current_user && current_user.login && (pull_request && pull_request.create_user === current_user.login);
-    const operate = current_user && projectDetail && pr_status === 0 && (permission || userLogin);
+    const permission = projectDetail && (projectDetail.permission === "Admin" || projectDetail.permission === "Owner" || projectDetail.permission === "Manager");
+    const userLogin = current_user && current_user.login;
+    const operate = userLogin && projectDetail && pr_status === 0 && permission;
     return (
       <div>
         {data ? (