diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2016-08-08 09:57:17 -0400 |
|---|---|---|
| committer | enahum <nahumhbl@gmail.com> | 2016-08-08 08:57:17 -0500 |
| commit | d2aa2a73962eb86db405821e4c518809bb3914b4 (patch) | |
| tree | b9851f9f10c0cc9e1c0c670256d29115ac22dec8 /webapp | |
| parent | f9e2674e35632a7467ee0072fe967450d50c633c (diff) | |
| download | chat-d2aa2a73962eb86db405821e4c518809bb3914b4.tar.gz chat-d2aa2a73962eb86db405821e4c518809bb3914b4.tar.bz2 chat-d2aa2a73962eb86db405821e4c518809bb3914b4.zip | |
PLT-3802 Moved compliance section of system console back to the bottom of the sidebar (#3751)
Diffstat (limited to 'webapp')
| -rw-r--r-- | webapp/components/admin_console/admin_sidebar.jsx | 33 |
1 files changed, 20 insertions, 13 deletions
diff --git a/webapp/components/admin_console/admin_sidebar.jsx b/webapp/components/admin_console/admin_sidebar.jsx index 3966f0219..4fcfe2731 100644 --- a/webapp/components/admin_console/admin_sidebar.jsx +++ b/webapp/components/admin_console/admin_sidebar.jsx @@ -323,6 +323,25 @@ export default class AdminSidebar extends React.Component { ); } + let otherCategory = null; + if (license || audits) { + otherCategory = ( + <AdminSidebarCategory + parentLink='/admin_console' + icon='fa-wrench' + title={ + <FormattedMessage + id='admin.sidebar.other' + defaultMessage='OTHER' + /> + } + > + {license} + {audits} + </AdminSidebarCategory> + ); + } + return ( <div className='admin-sidebar'> <AdminSidebarHeader/> @@ -347,7 +366,6 @@ export default class AdminSidebar extends React.Component { /> } /> - {audits} <AdminSidebarSection name='logs' title={ @@ -675,18 +693,7 @@ export default class AdminSidebar extends React.Component { </AdminSidebarSection> </AdminSidebarCategory> {this.renderTeams()} - <AdminSidebarCategory - parentLink='/admin_console' - icon='fa-wrench' - title={ - <FormattedMessage - id='admin.sidebar.other' - defaultMessage='OTHER' - /> - } - > - {license} - </AdminSidebarCategory> + {otherCategory} </ul> </div> <SelectTeamModal |