diff options
Diffstat (limited to 'webapp/components/navbar_dropdown.jsx')
-rw-r--r-- | webapp/components/navbar_dropdown.jsx | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/webapp/components/navbar_dropdown.jsx b/webapp/components/navbar_dropdown.jsx index c3b646e52..4f137979e 100644 --- a/webapp/components/navbar_dropdown.jsx +++ b/webapp/components/navbar_dropdown.jsx @@ -85,6 +85,7 @@ export default class NavbarDropdown extends React.Component { var isSystemAdmin = false; var teamSettings = null; let integrationsLink = null; + let customEmojiLink = null; if (currentUser != null) { isAdmin = TeamStore.isTeamAdminForCurrentTeam() || UserStore.isSystemAdminForCurrentUser(); @@ -166,7 +167,7 @@ export default class NavbarDropdown extends React.Component { if (integrationsEnabled && (isAdmin || window.mm_config.EnableOnlyAdminIntegrations !== 'true')) { integrationsLink = ( <li> - <Link to={'/' + Utils.getTeamNameFromUrl() + '/settings/integrations'}> + <Link to={'/' + Utils.getTeamNameFromUrl() + '/integrations'}> <FormattedMessage id='navbar_dropdown.integrations' defaultMessage='Integrations' @@ -176,6 +177,19 @@ export default class NavbarDropdown extends React.Component { ); } + if (window.mm_config.EnableCustomEmoji === 'true') { + customEmojiLink = ( + <li> + <Link to={'/' + Utils.getTeamNameFromUrl() + '/emoji'}> + <FormattedMessage + id='navbar_dropdown.emoji' + defaultMessage='Custom Emoji' + /> + </Link> + </li> + ); + } + if (isSystemAdmin) { sysAdminLink = ( <li> @@ -327,8 +341,10 @@ export default class NavbarDropdown extends React.Component { </a> </li> <li className='divider'></li> - {teamSettings} {integrationsLink} + {customEmojiLink} + <li className='divider'></li> + {teamSettings} {manageLink} {sysAdminLink} {teams} |