IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Added a unique error message for bad username and simplified error outputed to user

Browse Source
This commit is contained in:
nickago
2015-07-29 09:42:13 -07:00
parent 54265271fa
commit a07ab924d3
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
store/sql_user_store.go
View File

@@ -161,7 +161,11 @@ func (us SqlUserStore) Update(user *model.User, allowActiveUpdate bool) StoreCha
}
if count, err := us.GetMaster().Update(user); err != nil {
result.Err = model.NewAppError("SqlUserStore.Update", "We encounted an error updating the account", "user_id="+user.Id+", "+err.Error())
if IsUniqueConstraintError(err.Error(), "Username", "users_username_teamid_key") {
result.Err = model.NewAppError("SqlUserStore.Update", "This username is already taken. Please choose another.", "user_id="+user.Id+", "+err.Error())
} else {
result.Err = model.NewAppError("SqlUserStore.Update", "We encounted an error updating the account", "user_id="+user.Id+", "+err.Error())
}
} else if count != 1 {
result.Err = model.NewAppError("SqlUserStore.Update", "We couldn't update the account", fmt.Sprintf("user_id=%v, count=%v", user.Id, count))
} else {

2
web/react/components/user_settings.jsx
View File

@@ -709,7 +709,7 @@ var GeneralTab = React.createClass({
}.bind(this),
function(err) {
state = this.getInitialState();
state.server_error = err;
state.server_error = err.message;
this.setState(state);
}.bind(this)
);