From a55e9b4070eb856999a9a6c78eab94aec0041f4e Mon Sep 17 00:00:00 2001 From: Chengwei Yang Date: Wed, 30 Sep 2015 09:09:09 +0800 Subject: Change minimal length of team name to 3 character team named in 3 character in non-English language is very common, e.g. in Chinese. Signed-off-by: Chengwei Yang --- web/react/components/team_signup_url_page.jsx | 4 ++-- web/react/components/team_signup_with_sso.jsx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'web/react') 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..9b8f4f16a 100644 --- a/web/react/components/team_signup_with_sso.jsx +++ b/web/react/components/team_signup_with_sso.jsx @@ -23,7 +23,7 @@ export default class SSOSignUpPage extends React.Component { team.display_name = this.state.name; - if (team.display_name.length <= 3) { + if (team.display_name.length <= 2) { return; } @@ -68,7 +68,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; } -- cgit v1.2.3-1-g7c22 From 6a37d83bd2cafa0b052915b11792b3cdbb7b47bf Mon Sep 17 00:00:00 2001 From: Chengwei Yang Date: Wed, 30 Sep 2015 09:26:12 +0800 Subject: Check team name in correct sequence to avoid null pointer Signed-off-by: Chengwei Yang --- web/react/components/team_signup_with_sso.jsx | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'web/react') diff --git a/web/react/components/team_signup_with_sso.jsx b/web/react/components/team_signup_with_sso.jsx index 9b8f4f16a..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 <= 2) { + 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; } -- cgit v1.2.3-1-g7c22