diff --git a/src/forge/Merge/MessageCount.js b/src/forge/Merge/MessageCount.js index 25b8b17b7..b8316c783 100644 --- a/src/forge/Merge/MessageCount.js +++ b/src/forge/Merge/MessageCount.js @@ -371,7 +371,8 @@ class MessageCount extends Component { const userLogin = current_user && current_user.login; const otherPre = data && data.pull_request && projectDetail && (userLogin === data.pull_request.fork_project_user && projectDetail.permission===""); const permissionByCodeReview = projectDetail && (projectDetail.permission === "Admin" || projectDetail.permission === "Owner" || projectDetail.permission === "Manager" || projectDetail.permission === "Developer" || otherPre); - const operate = userLogin && projectDetail && pr_status === 0 && ( permission || otherPre); + const operate = userLogin && projectDetail && pr_status === 0 && permission ; + const cancelOperate = userLogin && projectDetail && pr_status === 0 && ( permission || otherPre); const open_blockchain = project && project.open_blockchain; return (
@@ -521,7 +522,7 @@ class MessageCount extends Component { )} - {operate && ( + {cancelOperate && (