From f944ebad6fce4d7c51f4cc1493f71e9995000a6c Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Wed, 4 Aug 2021 17:12:29 +0800
Subject: [PATCH] issue

---
 src/forge/Main/Detail.js      |  2 +-
 src/forge/Merge/merge.js      | 10 +++-------
 src/forge/Merge/merge_form.js | 26 ++++++++++++++------------
 src/forge/Order/order_form.js |  4 ++--
 4 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js
index f7820f10..f6dc83e0 100644
--- a/src/forge/Main/Detail.js
+++ b/src/forge/Main/Detail.js
@@ -442,7 +442,7 @@ class Detail extends Component {
                       <Link to={`${project.author.type ==="Organization" ? "/organize":'/users'}/${project.author.login}`}>{project.author.name}</Link>
                     }
                     <span className="ml5 mr5">/</span>
-                    <Link to={`/projects/${owner}/${projectsId}`} className="projectN mt6">{project && project.name}</Link>
+                    <Link to={`/projects/${owner}/${projectsId}`} className="projectN mt6">{projectDetail && projectDetail.name}</Link>
                   </div>
                   { projectDetail && projectDetail.private && <span className="privateTag mt6">私有</span>}
                 </AlignTop>
diff --git a/src/forge/Merge/merge.js b/src/forge/Merge/merge.js
index c0c7e5ce..90e35dcc 100644
--- a/src/forge/Merge/merge.js
+++ b/src/forge/Merge/merge.js
@@ -159,14 +159,10 @@ class merge extends Component {
         <Menu.Item key={"all"} onClick={(e) => this.getOption(e, id, name)}>
           {name}
         </Menu.Item>
-        {array &&
-          array.length > 0 &&
-          array.map((item, key) => {
+        {array && array.length > 0 && array.map((item, key) => {
             return (
-              <Menu.Item
-                key={item.id}
-                onClick={(e) => this.getOption(e, id, item.name)}
-              >
+              ((!item.permission) || (item.permission && item.permission !== "Reporter")) &&
+              <Menu.Item key={item.id} onClick={(e) => this.getOption(e, id, item.name)}>
                 {item.name}
               </Menu.Item>
             );
diff --git a/src/forge/Merge/merge_form.js b/src/forge/Merge/merge_form.js
index 1c75a9f9..d5e4a1b8 100644
--- a/src/forge/Merge/merge_form.js
+++ b/src/forge/Merge/merge_form.js
@@ -346,18 +346,20 @@ class MergeForm extends Component {
                       </Select>
                     )}
                   </Form.Item>
-                  <Form.Item name="checkbox-group" label="其他">
-                    <Checkbox.Group>
-                      <div>
-                        <Checkbox value="A">必须审查代码</Checkbox>
-                      </div>
-                      <div>
-                        <Checkbox value="B">合并后删除提交分支</Checkbox>
-                      </div>
-                      <div>
-                        <Checkbox value="C">合并后关闭提到的任务</Checkbox>
-                      </div>
-                    </Checkbox.Group>
+                  <Form.Item label="其他">
+                    {getFieldDecorator("checkbox-group")(
+                      <Checkbox.Group>
+                        <div>
+                          <Checkbox value="A">必须审查代码</Checkbox>
+                        </div>
+                        <div>
+                          <Checkbox value="B">合并后删除提交分支</Checkbox>
+                        </div>
+                        <div>
+                          <Checkbox value="C">合并后关闭提到的任务</Checkbox>
+                        </div>
+                      </Checkbox.Group>
+                    )}
                   </Form.Item>
                 </div>
               </div>
diff --git a/src/forge/Order/order_form.js b/src/forge/Order/order_form.js
index 45433631..b6f065b2 100644
--- a/src/forge/Order/order_form.js
+++ b/src/forge/Order/order_form.js
@@ -92,10 +92,10 @@ class order_form extends Component {
 
     const url = `/${owner}/${projectsId}/issues/new.json`;
     axios.get(url).then((result) => {
-      if (result) {
+      if (result && result.data) {
         this.setState({
           issue_chosen: result.data.issue_chosen,
-          branches: result.data.branches,
+          branches: result.data.issue_chosen.branches,
           isSpin:false
         });