diff options
| author | Asaad Mahmood <Unknowngi@live.com> | 2015-10-23 10:53:57 +0500 |
|---|---|---|
| committer | Asaad Mahmood <Unknowngi@live.com> | 2015-10-23 10:53:57 +0500 |
| commit | cc904a7ec73a44a337908c685bfc311bdbe1ff85 (patch) | |
| tree | 6fb865bb734cad0389490e4add11f2e308fe473c /web/react/components/sidebar_right_menu.jsx | |
| parent | 79ce0dd914713aac9d2f1332202a48e7e0d338a3 (diff) | |
| parent | 02a6f6b2cd4c0a6bf32b23961557c385039ae2f2 (diff) | |
| download | chat-cc904a7ec73a44a337908c685bfc311bdbe1ff85.tar.gz chat-cc904a7ec73a44a337908c685bfc311bdbe1ff85.tar.bz2 chat-cc904a7ec73a44a337908c685bfc311bdbe1ff85.zip | |
Merge branch 'master' of https://github.com/mattermost/platform into ui-improvements
Diffstat (limited to 'web/react/components/sidebar_right_menu.jsx')
| -rw-r--r-- | web/react/components/sidebar_right_menu.jsx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/web/react/components/sidebar_right_menu.jsx b/web/react/components/sidebar_right_menu.jsx index ac101d631..fddc98c9d 100644 --- a/web/react/components/sidebar_right_menu.jsx +++ b/web/react/components/sidebar_right_menu.jsx @@ -84,7 +84,7 @@ export default class SidebarRightMenu extends React.Component { consoleLink = ( <li> <a - href='/admin_console' + href={'/admin_console?' + utils.getSessionIndex()} > <i className='glyphicon glyphicon-wrench'></i>System Console</a> </li> @@ -92,8 +92,8 @@ export default class SidebarRightMenu extends React.Component { } var siteName = ''; - if (global.window.config.SiteName != null) { - siteName = global.window.config.SiteName; + if (global.window.mm_config.SiteName != null) { + siteName = global.window.mm_config.SiteName; } var teamDisplayName = siteName; if (this.props.teamDisplayName) { |