Gitlink
/
forgeplus-react
32
0
Fork 29
Code Issues Pull Requests Releases 1 Wiki Activity

change pr

This commit is contained in:
sylor_huang@126.com 2020-07-03 17:01:58 +08:00
parent 2dca31f6c6
commit 58d6a625fc
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -200,6 +200,7 @@ class MessageCount extends Component {
render() {
const { projectsId, mergeId } = this.props.match.params;
const {
data,
SpinMerge,
@ -208,8 +209,7 @@ class MessageCount extends Component {
ismesrge,
SpinFlag,
} = this.state;
const { current_user } = this.props;
const { current_user, projectDetail } = this.props;
const menu = (
<Menu onClick={(e) => this.getOption(e)}>
<Menu.Item key={"merge"} value="合并请求">
@ -353,10 +353,9 @@ class MessageCount extends Component {
</div>
<div className="ml10">
<div className="mt15 text-right">
{current_user &&
{current_user && projectDetail &&
pr_status !== 2 &&
(data.issue.author_login === current_user.login ||
data.issue.user_permission) && (
projectDetail.permission !=="Reporter" && (
<Button
type="success"
ghost
@ -365,7 +364,7 @@ class MessageCount extends Component {
编辑
</Button>
)}
{data.issue.user_permission && pr_status === 0 && (
{projectDetail && projectDetail.permission !=="Reporter" && pr_status === 0 && (
<Button
type="danger"
ghost
@ -403,7 +402,7 @@ class MessageCount extends Component {
type="success"
/>
)}
{pr_status === 0 && data.issue.user_permission && (
{pr_status === 0 && projectDetail && projectDetail.permission !=="Reporter" && (
<Spin spinning={SpinFlag}>
<div
style={{