From cc280f1597f01e785b7ba64da2c19d2b1f92972a Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Fri, 5 Jun 2020 14:46:26 +0800 Subject: [PATCH] change branch error --- src/forge/Main/CoderRootDirectory.js | 2 +- src/forge/Newfile/UserSubmitComponent.js | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/forge/Main/CoderRootDirectory.js b/src/forge/Main/CoderRootDirectory.js index fd5f3ddc9..a67b06893 100644 --- a/src/forge/Main/CoderRootDirectory.js +++ b/src/forge/Main/CoderRootDirectory.js @@ -101,7 +101,7 @@ class CoderRootDirectory extends Component { axios .get(url, { params: { - branch, + ref: branch, }, }) .then((result) => { diff --git a/src/forge/Newfile/UserSubmitComponent.js b/src/forge/Newfile/UserSubmitComponent.js index ceb07ca6a..fe9cc5d17 100644 --- a/src/forge/Newfile/UserSubmitComponent.js +++ b/src/forge/Newfile/UserSubmitComponent.js @@ -53,13 +53,8 @@ class UserSubmitComponent extends Component { let url = values.branchname ? `/projects/${projectsId}/coders?branch=${values.branchname}` : `/projects/${projectsId}/coders`; - if(result.data.pr_id){ - url = `/projects/${projectsId}/merge/${result.data.pr_id}/Messagecount` - } - // const url = values.branchname - // ? `/projects/${projectsId}/coders?branch=${values.branchname}` - // : `/projects/${projectsId}/coders`; this.props.history.push(url); + this.props.showNotification("文件新建成功!"); } }) .catch((error) => { @@ -96,9 +91,6 @@ class UserSubmitComponent extends Component { let url = values.branchname ? `/projects/${projectsId}/coders?branch=${values.branchname}` : `/projects/${projectsId}/coders`; - if(result.data.pr_id){ - url = `/projects/${projectsId}/merge/${result.data.pr_id}/Messagecount` - } this.props.history.push(url); this.props.showNotification("修改成功!");