opensource/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2026-09-24 16:05:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix uncleared server errors in user settings (#6964)

Browse Source
This commit is contained in:
Chris
2017-07-24 18:06:45 +01:00
committed by George Goldberg
parent 87746227bf
commit 72355ba2bf
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
webapp/components/user_settings/user_settings_general/user_settings_general.jsx
+4 -4
View File
@@ -131,10 +131,10 @@ class UserSettingsGeneralTab extends React.Component {
const {formatMessage} = this.props.intl;
const usernameError = Utils.isValidUsername(username);
if (usernameError === 'Cannot use a reserved word as a username.') {
this.setState({clientError: formatMessage(holders.usernameReserved)});
this.setState({clientError: formatMessage(holders.usernameReserved), serverError: ''});
return;
} else if (usernameError) {
this.setState({clientError: formatMessage(holders.usernameRestrictions, {min: Constants.MIN_USERNAME_LENGTH, max: Constants.MAX_USERNAME_LENGTH})});
this.setState({clientError: formatMessage(holders.usernameRestrictions, {min: Constants.MIN_USERNAME_LENGTH, max: Constants.MAX_USERNAME_LENGTH}), serverError: ''});
return;
}
@@ -259,10 +259,10 @@ class UserSettingsGeneralTab extends React.Component {
const file = this.state.pictureFile;
if (file.type !== 'image/jpeg' && file.type !== 'image/png') {
this.setState({clientError: formatMessage(holders.validImage)});
this.setState({clientError: formatMessage(holders.validImage), serverError: ''});
return;
} else if (file.size > this.state.maxFileSize) {
this.setState({clientError: formatMessage(holders.imageTooLarge)});
this.setState({clientError: formatMessage(holders.imageTooLarge), serverError: ''});
return;
}