hc1913847458
/
forgeplus-react
forked from Gitlink/forgeplus-react
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

change

This commit is contained in:
sylor_huang@126.com 2020-08-15 15:08:20 +08:00
parent 774904f1c4
commit ef5d2318d6
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/forge/Merge/NewMerge.js
View File

@ -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,