diff --git a/src/forge/Main/CoderDepot.jsx b/src/forge/Main/CoderDepot.jsx index 271aecabd..aa5d4168f 100644 --- a/src/forge/Main/CoderDepot.jsx +++ b/src/forge/Main/CoderDepot.jsx @@ -255,7 +255,7 @@ function CoderDepot(props){ const mdFlag = n && n.substring(n.length-3,n.length) === ".md"; const { current_user } = props; - const fileOperate = type === "dir" && projectDetail && projectDetail.type !== 2 && (projectDetail.permission !=="Reporter" || (current_user && current_user.admin)); + const fileOperate = type === "dir" && projectDetail && projectDetail.type !== 2 && ((projectDetail.permission && projectDetail.permission !=="Reporter") || (current_user && current_user.admin)); return( setOpenModal(false)} onOk={okUpdate}/> diff --git a/src/modules/tpm/TPMIndexHOC.js b/src/modules/tpm/TPMIndexHOC.js index 271afff9a..a3d5f42fd 100644 --- a/src/modules/tpm/TPMIndexHOC.js +++ b/src/modules/tpm/TPMIndexHOC.js @@ -154,9 +154,6 @@ export function TPMIndexHOC(WrappedComponent) { this.setState({ tpmLoading: false }) - if (this.props.match.path === "/" && response.data.login) { - this.props.history.push(`/users/${response.data.login}`); - } if(response.data && response.data.login){ if(!response.data.has_gitea_user || (response.data.has_gitea_user && !response.data.is_sync_pwd)){ this.setState({