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

pulls

This commit is contained in:
caishi 2021-01-13 14:16:18 +08:00
parent 7e47cad744
commit 9d0adc0747
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/forge/Merge/MessageCount.js
View File

@ -40,6 +40,7 @@ class MessageCount extends Component {
SpinMerge: false,
edit_spin: false,
pr_status: undefined,
pull_request:undefined,
copyVisible:false,
};
@ -69,11 +70,12 @@ class MessageCount extends Component {
axios
.get(url)
.then((result) => {
if (result) {
if (result && result.data) {
this.setState({
data: result.data,
SpinFlag: false,
pr_status: result.data && result.data.pull_request && result.data.pull_request.status,
pr_status: result.data.pull_request && result.data.pull_request.status,
pull_request:result.data.pull_request
});
} else {
this.setState({ SpinFlag: false });
@ -249,7 +251,8 @@ class MessageCount extends Component {
isSpin,
ismesrge,
SpinFlag,
copyVisible
copyVisible,
pull_request
} = this.state;
const { current_user, projectDetail } = this.props;
const menu = (
@ -268,9 +271,11 @@ class MessageCount extends Component {
</Menu.Item>
</Menu>
);
const permission = projectDetail && (projectDetail.permission === "Admin" || projectDetail.permission === "Owner");
const userLogin = current_user && current_user.login && (pull_request && pull_request.create_user === current_user.login);
const operate = current_user && projectDetail && pr_status === 0 && (permission || userLogin);
return (
<div className="">
<div>
{data ? (
<div>
<div className="main">
@ -300,7 +305,7 @@ class MessageCount extends Component {
<div className="mt15">
<Tag className="pr-branch-tag">
<Link
to={`/projects/${owner}/${data.pull_request.is_original?data.pull_request.identifier:projectsId}/branch/${data.pull_request.head}`}
to={`/projects/${owner}/${data.pull_request.is_original?data.project_identifier:projectsId}/branch/${data.pull_request.head}`}
className="ver-middle"
>
{data.pull_request.is_original ? data.pull_request.fork_project_user : data.issue.project_author_name}:{data.pull_request.head}
@ -401,9 +406,7 @@ class MessageCount extends Component {
</Dropdown>
<span>下载为<i className="iconfont icon-sanjiaoxing-down color-blue"></i></span>
</span> */}
{current_user && projectDetail &&
pr_status === 0 &&
projectDetail.permission !=="Reporter" && (
{operate && (
<Button
type="green"
ghost
@ -413,7 +416,7 @@ class MessageCount extends Component {
编辑
</Button>
)}
{projectDetail && projectDetail.permission !=="Reporter" && pr_status === 0 && (
{operate && (
<Button
type="danger"
ghost