diff options
author | Joram Wilander <jwawilander@gmail.com> | 2016-03-07 07:48:58 -0500 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2016-03-07 07:48:58 -0500 |
commit | a586f5ffbc70c20129521a08d8846a8fd89832c7 (patch) | |
tree | c5990164bb7bb3c59e59f2e72f254c23207b02ea /web/react | |
parent | e9c94bf27c0a4223c5fde0ba85155412c25d94f3 (diff) | |
parent | 31238f1d3a630b60bf8e1cfd90c9caa54f58d9f9 (diff) | |
download | chat-a586f5ffbc70c20129521a08d8846a8fd89832c7.tar.gz chat-a586f5ffbc70c20129521a08d8846a8fd89832c7.tar.bz2 chat-a586f5ffbc70c20129521a08d8846a8fd89832c7.zip |
Merge pull request #2333 from hmhealey/plt2194
PLT-2194 Removed Get Team Invite Link link when user creation is disabled
Diffstat (limited to 'web/react')
-rw-r--r-- | web/react/components/get_link_modal.jsx | 23 | ||||
-rw-r--r-- | web/react/components/navbar_dropdown.jsx | 2 |
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 |