diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js index 880b24a9..6fa8a0d4 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 7b676cb4..2dfa6f98 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 {
-
源分支:
+
源分支 :
} @@ -136,7 +136,7 @@ class MergeItem extends Component { to={`/${owner}/${projectsId}/tree/${turnbar(item.pull_request_base)}`} className="maxW200px task-hide ver-middle" style={{maxWidth:"200px"}} > - {project_author_name}:{item.pull_request_base} + {project_author_name}: {item.pull_request_base} } diff --git a/src/forge/Merge/MessageCount.js b/src/forge/Merge/MessageCount.js index 28140ddf..98a0d3c9 100644 --- a/src/forge/Merge/MessageCount.js +++ b/src/forge/Merge/MessageCount.js @@ -383,7 +383,7 @@ class MessageCount extends Component { to={`/${owner}/${projectsId}/tree/${data.pull_request.base}`} className="ver-middle task-hide" style={{maxWidth:"200px"}} title={`${data.issue.project_author_name}:${data.pull_request.base}`} > - {data.issue.project_author_name}:{data.pull_request.base} + {data.issue.project_author_name}: {data.pull_request.base}
diff --git a/src/forge/Merge/UpdateMerge.js b/src/forge/Merge/UpdateMerge.js index 8af84941..86a05dc3 100644 --- a/src/forge/Merge/UpdateMerge.js +++ b/src/forge/Merge/UpdateMerge.js @@ -61,7 +61,7 @@ class UpdateMerge extends Component {
-
源分支:
+
源分支 :