diff --git a/src/AppConfig.js b/src/AppConfig.js index e102edbe1..45f12c805 100644 --- a/src/AppConfig.js +++ b/src/AppConfig.js @@ -101,7 +101,7 @@ export function initAxiosInterceptors(props) { // 邀请页面不进行404跳转 if( window.location.pathname.includes('/invite') && (responseURL.includes('/simple.json')||responseURL.includes('/detail.json')||responseURL.includes('/menu_list.json'))){ }else{ - // locationurl('/nopage'); + locationurl('/nopage'); } } } diff --git a/src/forge/Merge/MergeItem.js b/src/forge/Merge/MergeItem.js index 8ca39bce0..583e71651 100644 --- a/src/forge/Merge/MergeItem.js +++ b/src/forge/Merge/MergeItem.js @@ -110,15 +110,22 @@ class MergeItem extends Component { { item.pull_request_head && - - {item.is_original - ? item.fork_project_user_name - : item.author_name} - : {item.pull_request_head} - + { + item.is_original ? + ( + (item.fork_project_user && item.fork_project_identifier) ? + + {item.fork_project_user_name || "仓库已删除"} : {item.pull_request_head || "分支已删除"} + + : + {item.fork_project_user_name || "仓库已删除"} : {item.pull_request_head || "分支已删除"} + ) + : + {item.author_name} :{item.pull_request_head || "分支已删除"} + } } {