fixed incorrect error display when trying a team URL with one character (#4223)
Этот коммит содержится в:
коммит произвёл
enahum
родитель
eac472b44f
Коммит
06e5c097b3
@@ -36,20 +36,22 @@ export default class TeamUrl extends React.Component {
|
|||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
|
|
||||||
const name = ReactDOM.findDOMNode(this.refs.name).value.trim();
|
const name = ReactDOM.findDOMNode(this.refs.name).value.trim();
|
||||||
|
const cleanedName = Utils.cleanUpUrlable(name);
|
||||||
|
const urlRegex = /^[a-z]+([a-z\-0-9]+|(__)?)[a-z0-9]+$/g;
|
||||||
|
|
||||||
if (!name) {
|
if (!name) {
|
||||||
this.setState({nameError: Utils.localizeMessage('create_team.team_url.required', 'This field is required')});
|
this.setState({nameError: Utils.localizeMessage('create_team.team_url.required', 'This field is required')});
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const cleanedName = Utils.cleanUpUrlable(name);
|
if (cleanedName.length < Constants.MIN_TEAMNAME_LENGTH || cleanedName.length > Constants.MAX_TEAMNAME_LENGTH) {
|
||||||
|
this.setState({nameError: Utils.localizeMessage('create_team.team_url.charLength', 'Name must be 4 or more characters up to a maximum of 15')});
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
const urlRegex = /^[a-z]+([a-z\-0-9]+|(__)?)[a-z0-9]+$/g;
|
|
||||||
if (cleanedName !== name || !urlRegex.test(name)) {
|
if (cleanedName !== name || !urlRegex.test(name)) {
|
||||||
this.setState({nameError: Utils.localizeMessage('create_team.team_url.regex', "Use only lower case letters, numbers and dashes. Must start with a letter and can't end in a dash.")});
|
this.setState({nameError: Utils.localizeMessage('create_team.team_url.regex', "Use only lower case letters, numbers and dashes. Must start with a letter and can't end in a dash.")});
|
||||||
return;
|
return;
|
||||||
} else if (cleanedName.length < Constants.MIN_TEAMNAME_LENGTH || cleanedName.length > Constants.MAX_TEAMNAME_LENGTH) {
|
|
||||||
this.setState({nameError: Utils.localizeMessage('create_team.team_url.charLength', 'Name must be 4 or more characters up to a maximum of 15')});
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (global.window.mm_config.RestrictTeamNames === 'true') {
|
if (global.window.mm_config.RestrictTeamNames === 'true') {
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user