diff --git a/src/forge/Merge/MergeItem.js b/src/forge/Merge/MergeItem.js index 61477c142..3e88eeb93 100644 --- a/src/forge/Merge/MergeItem.js +++ b/src/forge/Merge/MergeItem.js @@ -112,9 +112,9 @@ class MergeItem extends Component { to={`/${item.is_original ? item.fork_project_user : owner}/${ item.is_original ? item.fork_project_identifier : projectsId }/tree/${turnbar(item.pull_request_head)}`} className="maxW200px task-hide ver-middle" style={{maxWidth:"200px"}} > - {item.is_original - ? item.fork_project_user - : project_author_name} + {item.is_fork + ? item.pull_request_base + : item.author_name} :{item.pull_request_head} @@ -136,8 +136,8 @@ class MergeItem extends Component { to={`/${owner}/${projectsId}/tree/${turnbar(item.pull_request_base)}`} className="maxW200px task-hide ver-middle" style={{maxWidth:"200px"}} > - {/* {item.is_fork ? item.pull_request_base : `${item.author_name}:${item.pull_request_base}`} */} - {project_author_name}:{item.pull_request_base} + {item.is_fork ? item.pull_request_base : `${item.author_name}:${item.pull_request_base}`} + {/* {project_author_name}:{item.pull_request_base} */} } diff --git a/src/forge/Merge/MessageCount.js b/src/forge/Merge/MessageCount.js index 6d01e8a37..d7f665dd3 100644 --- a/src/forge/Merge/MessageCount.js +++ b/src/forge/Merge/MessageCount.js @@ -365,10 +365,10 @@ class MessageCount extends Component {
- {data.pull_request.is_original ? data.pull_request.fork_project_user : data.issue.project_author_name}: {data.pull_request && data.pull_request.head} + {data.pull_request.is_fork ? data.pull_request_base.fork_project_user : data.issue.author_name}: {data.pull_request && data.pull_request.head} @@ -383,7 +383,7 @@ class MessageCount extends Component { to={`/${owner}/${projectsId}/tree/${data.pull_request.base}`} className="ver-middle task-hide" style={{maxWidth:"200px"}} title={`${data.issue.project_author_name}:${data.pull_request.base}`} > - {data.issue.project_author_name}:{data.pull_request.base} + {data.issue.author_name}:{data.pull_request.base}