summaryrefslogtreecommitdiffstats
path: root/webapp/components/admin_console
diff options
context:
space:
mode:
authorenahum <nahumhbl@gmail.com>2016-11-04 13:05:32 -0300
committerHarrison Healey <harrisonmhealey@gmail.com>2016-11-04 12:05:32 -0400
commit772b57386f4dd6bca97e7b7508e9c286bb60502f (patch)
treef99074ba97d40abb12c56a199ce9d6262a9ae442 /webapp/components/admin_console
parent6289c726862c9d1356fb8d78694d1ef2d7527756 (diff)
downloadchat-772b57386f4dd6bca97e7b7508e9c286bb60502f.tar.gz
chat-772b57386f4dd6bca97e7b7508e9c286bb60502f.tar.bz2
chat-772b57386f4dd6bca97e7b7508e9c286bb60502f.zip
PLT-4550 move webrtc to TE (#4440)
* PLT-4550 move webrtc to TE * remove webrtc from makefile enterprise tests
Diffstat (limited to 'webapp/components/admin_console')
-rw-r--r--webapp/components/admin_console/admin_sidebar.jsx27
1 files changed, 12 insertions, 15 deletions
diff --git a/webapp/components/admin_console/admin_sidebar.jsx b/webapp/components/admin_console/admin_sidebar.jsx
index 4de0cf007..f39bb8b6b 100644
--- a/webapp/components/admin_console/admin_sidebar.jsx
+++ b/webapp/components/admin_console/admin_sidebar.jsx
@@ -193,7 +193,6 @@ export default class AdminSidebar extends React.Component {
let samlSettings = null;
let clusterSettings = null;
let complianceSettings = null;
- let webrtcSettings = null;
let license = null;
let audits = null;
@@ -270,20 +269,6 @@ export default class AdminSidebar extends React.Component {
);
}
- if (global.window.mm_license.Webrtc === 'true') {
- webrtcSettings = (
- <AdminSidebarSection
- name='webrtc'
- title={
- <FormattedMessage
- id='admin.sidebar.webrtc'
- defaultMessage='WebRTC (Beta)'
- />
- }
- />
- );
- }
-
oauthSettings = (
<AdminSidebarSection
name='oauth'
@@ -370,6 +355,18 @@ export default class AdminSidebar extends React.Component {
);
}
+ const webrtcSettings = (
+ <AdminSidebarSection
+ name='webrtc'
+ title={
+ <FormattedMessage
+ id='admin.sidebar.webrtc'
+ defaultMessage='WebRTC (Beta)'
+ />
+ }
+ />
+ );
+
return (
<div className='admin-sidebar'>
<AdminSidebarHeader/>