diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-10-22 09:19:18 -0700 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-10-22 09:19:18 -0700 |
| commit | 54894e90ac705eab3bf0f34c8dd197bb0929feae (patch) | |
| tree | 2fd5c6bc1bdb8cef1ea6095e8f12f8fd73a52ce9 /web/react/components/team_signup_url_page.jsx | |
| parent | c4c04e5f02253dfdfc2bd09e06955f1f5932ce18 (diff) | |
| parent | 649f42e3fc706f8fa829276bcdb825381bc703f2 (diff) | |
| download | chat-54894e90ac705eab3bf0f34c8dd197bb0929feae.tar.gz chat-54894e90ac705eab3bf0f34c8dd197bb0929feae.tar.bz2 chat-54894e90ac705eab3bf0f34c8dd197bb0929feae.zip | |
Fixing merge conflict
Diffstat (limited to 'web/react/components/team_signup_url_page.jsx')
| -rw-r--r-- | web/react/components/team_signup_url_page.jsx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/web/react/components/team_signup_url_page.jsx b/web/react/components/team_signup_url_page.jsx index 67e4c9dd7..6d333aed6 100644 --- a/web/react/components/team_signup_url_page.jsx +++ b/web/react/components/team_signup_url_page.jsx @@ -40,10 +40,12 @@ export default class TeamSignupUrlPage extends React.Component { return; } - for (let index = 0; index < Constants.RESERVED_TEAM_NAMES.length; index++) { - if (cleanedName.indexOf(Constants.RESERVED_TEAM_NAMES[index]) === 0) { - this.setState({nameError: 'URL is taken or contains a reserved word'}); - return; + if (global.window.mm_config.RestrictTeamNames === 'true') { + for (let index = 0; index < Constants.RESERVED_TEAM_NAMES.length; index++) { + if (cleanedName.indexOf(Constants.RESERVED_TEAM_NAMES[index]) === 0) { + this.setState({nameError: 'URL is taken or contains a reserved word'}); + return; + } } } |