diff options
author | Corey Hulen <corey@hulen.com> | 2016-03-17 13:16:10 -0700 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2016-03-17 13:16:10 -0700 |
commit | 53d7718e57d4225eb5c020324d32cbe5b5eca7ad (patch) | |
tree | 9e549812c250513d56dd631c65c49402ea549ff7 /webapp/components/admin_console/admin_controller.jsx | |
parent | 8d571ee498c97128bd797f8ac1cb4c3c995fb875 (diff) | |
parent | 2e5cc29738340c7330d1b2606ceba40865872e4c (diff) | |
download | chat-53d7718e57d4225eb5c020324d32cbe5b5eca7ad.tar.gz chat-53d7718e57d4225eb5c020324d32cbe5b5eca7ad.tar.bz2 chat-53d7718e57d4225eb5c020324d32cbe5b5eca7ad.zip |
Merge pull request #2442 from mattermost/PLT-2115
PLT-2115 adding compliance feature
Diffstat (limited to 'webapp/components/admin_console/admin_controller.jsx')
-rw-r--r-- | webapp/components/admin_console/admin_controller.jsx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/webapp/components/admin_console/admin_controller.jsx b/webapp/components/admin_console/admin_controller.jsx index e4a4e28fc..aea2a0197 100644 --- a/webapp/components/admin_console/admin_controller.jsx +++ b/webapp/components/admin_console/admin_controller.jsx @@ -23,6 +23,7 @@ import LegalAndSupportSettingsTab from './legal_and_support_settings.jsx'; import TeamUsersTab from './team_users.jsx'; import TeamAnalyticsTab from '../analytics/team_analytics.jsx'; import LdapSettingsTab from './ldap_settings.jsx'; +import ComplianceSettingsTab from './compliance_settings.jsx'; import LicenseSettingsTab from './license_settings.jsx'; import SystemAnalyticsTab from '../analytics/system_analytics.jsx'; @@ -159,6 +160,8 @@ export default class AdminController extends React.Component { tab = <LegalAndSupportSettingsTab config={this.state.config}/>; } else if (this.state.selected === 'ldap_settings') { tab = <LdapSettingsTab config={this.state.config}/>; + } else if (this.state.selected === 'compliance_settings') { + tab = <ComplianceSettingsTab config={this.state.config}/>; } else if (this.state.selected === 'license') { tab = <LicenseSettingsTab config={this.state.config}/>; } else if (this.state.selected === 'team_users') { |