Nigel
/
forgeplus-react
forked from Gitlink/forgeplus-react
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'newVersion_forge' into dev_devOps 

# Conflicts:
#	src/forge/Main/Detail.js
This commit is contained in:
caishi 2020-10-19 15:43:53 +08:00
parent ded423ee2c 7edaa9e09c
commit b6dfe2cd4a
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/modules/tpm/NewHeader.js
View File

@ -575,19 +575,11 @@ class NewHeader extends Component {
matchpaths = (url) => { matchpaths = (url) => {
const { match } = this.props; const { match } = this.props;
if(url){ if(url){
if (url === '/forums' && match.path === '/forums') { if (url.indexOf('forums') > -1 && match.path.indexOf('forums') > -1) {
return true return true
} else if (url.startsWith('/projects') && match.path.startsWith('/projects')) { } else if (url.indexOf('projects') > -1 && match.path.indexOf('projects') > -1) {
return true return true
} else if (url.startsWith('/paths') && match.path.startsWith('/paths')) { } else if (url.indexOf('users') > -1 && match.path.indexOf('users') > -1) {
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')) {
return true return true
} else { } else {
return false return false