diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js index 880b24a93..6fa8a0d43 100644 --- a/src/forge/Main/Detail.js +++ b/src/forge/Main/Detail.js @@ -423,6 +423,10 @@ class Detail extends Component { const url = `/${owner}/${projectsId}/forks.json`; axios.post(url).then(result => { if (result && result.data.status === 0) { + if(result.data.message === "fork失败,你已拥有了这个项目"){ + this.props.history.push(`/${current_user && current_user.login}/${projectsId}`); + return; + } this.props.history.push(`/${current_user && current_user.login}/${result.data.identifier}`); this.props.showNotification(result.data.message); } diff --git a/src/forge/Merge/CreateMerge.js b/src/forge/Merge/CreateMerge.js index 7b676cb46..2dfa6f98b 100644 --- a/src/forge/Merge/CreateMerge.js +++ b/src/forge/Merge/CreateMerge.js @@ -124,7 +124,6 @@ class CreateMerge extends Component { initUser && initUser[0] && this.selectProjectName(initUser[0].id,false,{projects_names: result.data.projects_names,id: result.data.id}); } this.setState({isSpin: false}); - console.log('setTimeout state', this.state.data); // 如果url上的分支不存在,取默认值master const noMergeBranch = (result.data.branches || []).filter( @@ -363,7 +362,7 @@ class CreateMerge extends Component {