diff --git a/src/forge/Merge/NewMerge.js b/src/forge/Merge/NewMerge.js index 331b8971..2a5554ed 100644 --- a/src/forge/Merge/NewMerge.js +++ b/src/forge/Merge/NewMerge.js @@ -16,6 +16,7 @@ class NewMerge extends Component { merge_projects: undefined, merge: "master", pull: "master", + id: undefined, is_fork: false, projects_names: undefined, isSpin: false, @@ -50,6 +51,7 @@ class NewMerge extends Component { branches: result.data.branches, merge_branches: result.data.branches, project_id: result.data.project_id, + id: result.data.id }); this.set_default_pull(result.data.branches); this.set_default_merge(result.data.merge_projects); @@ -118,12 +120,13 @@ class NewMerge extends Component { }; selectProjectName = (value) => { - const { project_id, projects_names } = this.state; + console.log("value",value) + const { project_id, projects_names,id } = this.state; const { owner } = this.props.match.params; let arr = projects_names && projects_names.filter(item=>item.id===value); let identifier = arr && arr[0].project_id; let login = arr && arr[0].project_user_login; - let is_fork_id = parseInt(value) !== parseInt(project_id) + let is_fork_id = parseInt(value) !== parseInt(id) this.setState({ isSpin: true, merge_head: is_fork_id,