Merge branch 'master' of https://github.com/mattermost/platform into plt-383

1 files changed, 15 insertions, 0 deletions

diff --git a/web/react/components/sidebar_right_menu.jsx b/web/react/components/sidebar_right_menu.jsx
index f1341d9d7..2df2c8ffd 100644
--- a/web/react/components/sidebar_right_menu.jsx
+++ b/web/react/components/sidebar_right_menu.jsx
@@ -26,11 +26,14 @@ export default class SidebarRightMenu extends React.Component {
         var inviteLink = '';
         var teamSettingsLink = '';
         var manageLink = '';
+        var consoleLink = '';
         var currentUser = UserStore.getCurrentUser();
         var isAdmin = false;
+        var isSystemAdmin = false;
 
         if (currentUser != null) {
             isAdmin = utils.isAdmin(currentUser.roles);
+            isSystemAdmin = utils.isSystemAdmin(currentUser.roles);
 
             inviteLink = (
                 <li>
@@ -77,6 +80,17 @@ export default class SidebarRightMenu extends React.Component {
             );
         }
 
+        if (isSystemAdmin) {
+            consoleLink = (
+                <li>
+                    <a
+                        href='/admin_console'
+                    >
+                    <i className='glyphicon glyphicon-wrench'></i>System Console</a>
+                </li>
+            );
+        }
+
         var siteName = '';
         if (global.window.config.SiteName != null) {
             siteName = global.window.config.SiteName;
@@ -107,6 +121,7 @@ export default class SidebarRightMenu extends React.Component {
                         {inviteLink}
                         {teamLink}
                         {manageLink}
+                        {consoleLink}
                         <li>
                             <a
                                 href='#'