Gitlink
/
forgeplus-react
39
0
Fork 30
Code Issues Pull Requests Releases 1 Wiki Activity

合并请求重复加密

This commit is contained in:
caishi 2024-09-11 10:21:16 +08:00
parent 16ad133bd2
commit b4bf41894d
2 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/forge/Merge/CreateMerge.js
View File

@ -275,8 +275,8 @@ class CreateMerge extends Component {
let _url = `/${mergeOwner}/${projectId}/compare/`;
// type为pull时，pullBranch取value，否则取原有值
// type为pull时，mergeBranch取原有值，否则取value
let _pullBranch = type === 'pull' ? value : pullBranch;
let _mergeBranch = type === 'pull' ? mergeBranch : value;
let _pullBranch = type === 'pull' ? value : returnbar(pullBranch);
let _mergeBranch = type === 'pull' ? returnbar(mergeBranch): value;
if (pullOwner === mergeOwner) {
// 如果仓库相同, compare/目标分支...源分支
_url += `${turnbar(_mergeBranch)}...${turnbar(_pullBranch)}`;

92
src/forge/users/Index.jsx
View File

@ -24,52 +24,52 @@ class DetailTop extends Component {
this.state = {}
}
getProject = (num) => {
const { projectsId, owner } = this.props.match.params;
const url = `http://172.20.32.201:4000/${owner}/${projectsId}/simple.json`;
axios.get(url).then((result) => {
if (result && result.data) {
this.setState({
project: result.data,
open_devops: result.data.open_devops,
platform: result.data.platform && result.data.platform !== 'educoder'
})
if (result.data.type !== 0 && result.data.mirror_status === 1) {
console.log("--------start channel --------");
// 是镜像项目，且未完成迁移
this.canvasChannel();
if (num) {
this.setState({
secondSync: true,
firstSync: false
})
} else {
this.setState({
firstSync: true,
secondSync: false
})
}
this.setState({
mirror_status:1
})
} else if (result.data.mirror_status === 2) {
this.setState({
mirror_status:2,
firstSync: false
})
this.deleteProjectBack();
} else {
this.setState({
firstSync: false,
secondSync: false,
mirror_status:0
})
this.getBanner();
this.getDetail();
}
}
})
}
// getProject = (num) => {
// const { projectsId, owner } = this.props.match.params;
// const url = `/${owner}/${projectsId}/simple.json`;
// axios.get(url).then((result) => {
// if (result && result.data) {
// this.setState({
// project: result.data,
// open_devops: result.data.open_devops,
// platform: result.data.platform && result.data.platform !== 'educoder'
// })
// if (result.data.type !== 0 && result.data.mirror_status === 1) {
// console.log("--------start channel --------");
// // 是镜像项目，且未完成迁移
// this.canvasChannel();
// if (num) {
// this.setState({
// secondSync: true,
// firstSync: false
// })
// } else {
// this.setState({
// firstSync: true,
// secondSync: false
// })
// }
// this.setState({
// mirror_status:1
// })
// } else if (result.data.mirror_status === 2) {
// this.setState({
// mirror_status:2,
// firstSync: false
// })
// this.deleteProjectBack();
// } else {
// this.setState({
// firstSync: false,
// secondSync: false,
// mirror_status:0
// })
// this.getBanner();
// this.getDetail();
// }
// }
// })
// }
render() {
// 个人中心新增的二级目录都需在此添加一次。将项目放组织和个人名下后，此处根据二级目录作判断，