diff options
author | Christopher Speller <crspeller@gmail.com> | 2015-09-30 11:43:05 -0400 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2015-09-30 11:43:05 -0400 |
commit | 46f86e7076a1dec6717a959299a08289a5cc54ac (patch) | |
tree | cf68815b0701065d7d58a4624d004f60f3135f38 /web/react | |
parent | 1366557abb1af7a97aa6d7859d3dce329ab74c7a (diff) | |
parent | 6a37d83bd2cafa0b052915b11792b3cdbb7b47bf (diff) | |
download | chat-46f86e7076a1dec6717a959299a08289a5cc54ac.tar.gz chat-46f86e7076a1dec6717a959299a08289a5cc54ac.tar.bz2 chat-46f86e7076a1dec6717a959299a08289a5cc54ac.zip |
Merge pull request #867 from chengweiv5/team-name
Team name
Diffstat (limited to 'web/react')
-rw-r--r-- | web/react/components/team_signup_url_page.jsx | 4 | ||||
-rw-r--r-- | web/react/components/team_signup_with_sso.jsx | 10 |
2 files changed, 8 insertions, 6 deletions
diff --git a/web/react/components/team_signup_url_page.jsx b/web/react/components/team_signup_url_page.jsx index 1b722d611..a3f89a217 100644 --- a/web/react/components/team_signup_url_page.jsx +++ b/web/react/components/team_signup_url_page.jsx @@ -35,8 +35,8 @@ export default class TeamSignupUrlPage extends React.Component { if (cleanedName !== name || !urlRegex.test(name)) { this.setState({nameError: "Use only lower case letters, numbers and dashes. Must start with a letter and can't end in a dash."}); return; - } else if (cleanedName.length <= 3 || cleanedName.length > 15) { - this.setState({nameError: 'Name must be 4 or more characters up to a maximum of 15'}); + } else if (cleanedName.length <= 2 || cleanedName.length > 15) { + this.setState({nameError: 'Name must be 3 or more characters up to a maximum of 15'}); return; } diff --git a/web/react/components/team_signup_with_sso.jsx b/web/react/components/team_signup_with_sso.jsx index a4972dd8d..14f281f7a 100644 --- a/web/react/components/team_signup_with_sso.jsx +++ b/web/react/components/team_signup_with_sso.jsx @@ -23,12 +23,14 @@ export default class SSOSignUpPage extends React.Component { team.display_name = this.state.name; - if (team.display_name.length <= 3) { + if (!team.display_name) { + state.nameError = 'Please enter a team name'; + this.setState(state); return; } - if (!team.display_name) { - state.nameError = 'Please enter a team name'; + if (team.display_name.length <= 2) { + state.nameError = 'Name must be 3 or more characters up to a maximum of 15'; this.setState(state); return; } @@ -68,7 +70,7 @@ export default class SSOSignUpPage extends React.Component { } var disabled = false; - if (this.state.name.length <= 3) { + if (this.state.name.length <= 2) { disabled = true; } |