From 6efe287bc18387a4d72f9911202b45c6e1cba8d8 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Tue, 18 Aug 2020 17:21:11 +0800
Subject: [PATCH] labels

---
 src/forge/Main/CoderRootFileDetail.js |  2 +-
 src/forge/Merge/MergeItem.js          |  4 +---
 src/forge/Order/Detail.js             |  2 +-
 src/forge/Order/Tags.js               | 16 ++++++++--------
 src/forge/Order/order.js              |  8 ++++----
 5 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/forge/Main/CoderRootFileDetail.js b/src/forge/Main/CoderRootFileDetail.js
index a12375c4..f0c9d06a 100644
--- a/src/forge/Main/CoderRootFileDetail.js
+++ b/src/forge/Main/CoderRootFileDetail.js
@@ -136,7 +136,7 @@ class CoderRootFileDetail extends Component {
       .then((result) => {
         if (result) {
           this.props.showNotification("删除成功!");
-          this.props.history.push(`/projects/${projectsId}`);
+          this.props.history.push(`/projects/${owner}/${projectsId}`);
         }
       })
       .catch((error) => {
diff --git a/src/forge/Merge/MergeItem.js b/src/forge/Merge/MergeItem.js
index 3a8f6bd6..d34f5382 100644
--- a/src/forge/Merge/MergeItem.js
+++ b/src/forge/Merge/MergeItem.js
@@ -98,9 +98,7 @@ class MergeItem extends Component {
                     <span className="ml15">
                       <Tag className="pr-branch-tag">
                         <Link
-                          to={`/projects/${
-                            item.is_original ? item.fork_project_id : projectsId
-                          }/coders?branch=${item.pull_request_head}`}
+                          to={`/projects/${owner}/${ item.is_original ? item.fork_project_id : projectsId }/coders?branch=${item.pull_request_head}`}
                           className="maxW200px hide-1 ver-middle"
                         >
                           {item.is_original
diff --git a/src/forge/Order/Detail.js b/src/forge/Order/Detail.js
index f1453f35..c22013a3 100644
--- a/src/forge/Order/Detail.js
+++ b/src/forge/Order/Detail.js
@@ -85,7 +85,7 @@ class Detail extends Component {
       })
       .then((result) => {
         if (result) {
-          this.props.history.push(`/projects/${projectsId}/issues`);
+          this.props.history.push(`/projects/${owner}/${projectsId}/issues`);
         }
       })
       .catch((error) => {
diff --git a/src/forge/Order/Tags.js b/src/forge/Order/Tags.js
index 5183222b..0a4c10d3 100644
--- a/src/forge/Order/Tags.js
+++ b/src/forge/Order/Tags.js
@@ -80,9 +80,9 @@ class Tags extends Component {
 
 
   getList = (page, order_name, order_type) => {
-    const { projectsId } = this.props.match.params;
+    const { projectsId ,owner } = this.props.match.params;
     const { limit } = this.state;
-    const url = `/projects/${projectsId}/issue_tags.json`;
+    const url = `/projects/${owner}/${projectsId}/labels.json`;
     axios.get(url, {
       params: {
         page, limit, order_name, order_type
@@ -101,8 +101,8 @@ class Tags extends Component {
   createtagpost = () => {
     this.props.form.validateFieldsAndScroll((err, values) => {
       if (!err) {
-        const { projectsId } = this.props.match.params;
-        const url = `/projects/${projectsId}/issue_tags.json`;
+        const { projectsId , owner } = this.props.match.params;
+        const url = `/projects/${owner}/${projectsId}/labels.json`;
         axios.post(url, {
           ...values,
           project_id: projectsId,
@@ -183,9 +183,9 @@ class Tags extends Component {
     this.updatetag();
   }
   updatetag = () => {
-    const { projectsId } = this.props.match.params;
+    const { projectsId , owner } = this.props.match.params;
     let id = this.state.id;
-    const url = `/projects/${projectsId}/issue_tags/${id}.json`;
+    const url = `/projects/${owner}/${projectsId}/labels/${id}.json`;
     let name = this.state.name;
     let description = this.state.description;
     let modalcolor = this.state.newcolor
@@ -208,8 +208,8 @@ class Tags extends Component {
   }
 
   deletetag = (id) => {
-    const { projectsId } = this.props.match.params;
-    const url = `/projects/${projectsId}/issue_tags/${id}.json`;
+    const { projectsId , owner } = this.props.match.params;
+    const url = `/projects/${owner}/${projectsId}/labels/${id}.json`;
     axios.delete(url, {
       data: {
         project_id: projectsId,
diff --git a/src/forge/Order/order.js b/src/forge/Order/order.js
index 784111fe..7e2715f2 100644
--- a/src/forge/Order/order.js
+++ b/src/forge/Order/order.js
@@ -316,8 +316,8 @@ class order extends Component {
   };
 
   deletedetail = (id) => {
-    const { projectsId } = this.props.match.params;
-    const url = `/projects/${projectsId}/issues/${id}.json`;
+    const { projectsId , owner } = this.props.match.params;
+    const url = `/projects/${owner}/${projectsId}/issues/${id}.json`;
     axios.delete(url, {
       data: {
         project_id: projectsId,
@@ -470,8 +470,8 @@ class order extends Component {
           isSpin: true
         })
         const { checkedValue } = this.state;
-        const { projectsId } = this.props.match.params;
-        const url = `/projects/${projectsId}/issues/clean.json`;
+        const { projectsId , owner } = this.props.match.params;
+        const url = `/projects/${owner}/${projectsId}/issues/clean.json`;
         axios.post(url, {
           ids: checkedValue
         }).then(result => {