From 5a8daf7cfe25c99e124741dc5aeefa9eb5b59f0e Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Fri, 16 Oct 2020 17:17:14 +0800 Subject: [PATCH 1/2] Change NewHeader active --- src/modules/tpm/NewHeader.js | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/src/modules/tpm/NewHeader.js b/src/modules/tpm/NewHeader.js index e064d4a7..63748f94 100644 --- a/src/modules/tpm/NewHeader.js +++ b/src/modules/tpm/NewHeader.js @@ -575,19 +575,11 @@ class NewHeader extends Component { matchpaths = (url) => { const { match } = this.props; if(url){ - if (url === '/forums' && match.path === '/forums') { + if (url.indexOf('forums') > -1 && match.path.indexOf('forums') > -1) { return true - } else if (url.startsWith('/projects') && match.path.startsWith('/projects')) { + } else if (url.indexOf('projects') > -1 && match.path.indexOf('projects') > -1) { return true - } else if (url.startsWith('/paths') && match.path.startsWith('/paths')) { - return true - } else if (url.startsWith('/courses') && match.path.startsWith('/courses')) { - return true - } else if (url.startsWith('/competitions') && match.path.startsWith('/competitions')) { - return true - } else if (url.startsWith('/statistics') && match.path.startsWith('/statistics')) { - return true - } else if (url.startsWith('/users') && match.path.startsWith('/users')) { + } else if (url.indexOf('users') > -1 && match.path.indexOf('users') > -1) { return true } else { return false From 7edaa9e09c45416d2b5a2e36b097253f3fbf3af7 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Mon, 19 Oct 2020 15:41:10 +0800 Subject: [PATCH 2/2] manager/owner --- src/forge/Main/Detail.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js index af7eb336..334103ae 100644 --- a/src/forge/Main/Detail.js +++ b/src/forge/Main/Detail.js @@ -244,7 +244,7 @@ class Detail extends Component { this.setState({ projectDetail: result.data, project_id: result.data.project_id, - isManager: result.data.permission && result.data.permission === "Manager", + isManager: result.data.permission && (result.data.permission === "Manager"|| result.data.permission === "Admin" || result.data.permission === "Owner"), isReporter: result.data.permission && result.data.permission === "Reporter", isDeveloper: result.data.permission && result.data.permission === "Developer", http_url: result.data.clone_url,