Merge pull request #2333 from hmhealey/plt2194

PLT-2194 Removed Get Team Invite Link link when user creation is disabled

2 files changed, 10 insertions, 15 deletions

diff --git a/web/react/components/get_link_modal.jsx b/web/react/components/get_link_modal.jsx
index 6a5c3b588..3309d690c 100644
--- a/web/react/components/get_link_modal.jsx
+++ b/web/react/components/get_link_modal.jsx
@@ -41,8 +41,6 @@ export default class GetLinkModal extends React.Component {
     }
 
     render() {
-        const userCreationEnabled = global.window.mm_config.EnableUserCreation === 'true';
-
         let helpText = null;
         if (this.props.helpText) {
             helpText = (
@@ -55,7 +53,7 @@ export default class GetLinkModal extends React.Component {
         }
 
         let copyLink = null;
-        if (userCreationEnabled && document.queryCommandSupported('copy')) {
+        if (document.queryCommandSupported('copy')) {
             copyLink = (
                 <button
                     data-copy-btn='true'
@@ -71,17 +69,14 @@ export default class GetLinkModal extends React.Component {
             );
         }
 
-        let linkText = null;
-        if (userCreationEnabled) {
-            linkText = (
-                <textarea
-                    className='form-control no-resize min-height'
-                    readOnly='true'
-                    ref='textarea'
-                    value={this.props.link}
-                />
-            );
-        }
+        const linkText = (
+            <textarea
+                className='form-control no-resize min-height'
+                readOnly='true'
+                ref='textarea'
+                value={this.props.link}
+            />
+        );
 
         var copyLinkConfirm = null;
         if (this.state.copiedLink) {
diff --git a/web/react/components/navbar_dropdown.jsx b/web/react/components/navbar_dropdown.jsx
index e9df03c33..0ddd6ff4f 100644
--- a/web/react/components/navbar_dropdown.jsx
+++ b/web/react/components/navbar_dropdown.jsx
@@ -107,7 +107,7 @@ export default class NavbarDropdown extends React.Component {
                 </li>
             );
 
-            if (this.props.teamType === Constants.OPEN_TEAM) {
+            if (this.props.teamType === Constants.OPEN_TEAM && global.window.mm_config.EnableUserCreation === 'true') {
                 teamLink = (
                     <li>
                         <a