diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-10-21 11:31:31 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-10-21 11:31:31 -0400 |
| commit | 0e49acede9b077a1533d9a55494277fbc952d47c (patch) | |
| tree | 4991c8823458d57b127eff3106466188b6403675 /web/react/components/team_signup_url_page.jsx | |
| parent | a4e6cce98eb0c04deaa929ccd28b266e312c0ca1 (diff) | |
| parent | 0bfdfd79f0071cfd41f2dfbe20d1cb099b57a15c (diff) | |
| download | chat-0e49acede9b077a1533d9a55494277fbc952d47c.tar.gz chat-0e49acede9b077a1533d9a55494277fbc952d47c.tar.bz2 chat-0e49acede9b077a1533d9a55494277fbc952d47c.zip | |
Merge pull request #1131 from mattermost/PLT-350
PLT-350 allow ability to disable restricted team names
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..75ec2dfd9 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.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; + } } } |